Просмотр исходного кода

优化管理端筛选框逻辑

jiapu 5 месяцев назад
Родитель
Сommit
438c25cd15

+ 11 - 0
code/backend/src/main/java/com/aijiuyi/admin/controller/PlanController.java

@@ -37,6 +37,17 @@ public class PlanController {
         return Result.success(planService.pageList(queryDTO));
     }
 
+    /**
+     * 获取已有创作人列表(用于筛选下拉框)
+     *
+     * @return 创作人名称列表
+     */
+    @GetMapping("/authors")
+    @Log(value = "查询方案创作人列表", module = "方案管理", operationType = OperationType.QUERY)
+    public Result<List<String>> listAuthors() {
+        return Result.success(planService.listAuthors());
+    }
+
     /**
      * 查询方案详情(含步骤列表)
      *

+ 7 - 0
code/backend/src/main/java/com/aijiuyi/admin/service/PlanService.java

@@ -96,6 +96,13 @@ public interface PlanService extends IService<Plan> {
      */
     List<PlanStep> getStepsByPlanId(Long planId);
 
+    /**
+     * 查询数据库中已有的创作人列表(去重,按名称排序,用于筛选下拉框)
+     *
+     * @return 创作人名称列表
+     */
+    List<String> listAuthors();
+
     /**
      * 用户新增自定义方案(含步骤)
      *

+ 22 - 0
code/backend/src/main/java/com/aijiuyi/admin/service/impl/PlanServiceImpl.java

@@ -416,6 +416,28 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         );
     }
 
+    /**
+     * 查询数据库中有效(未删除)方案已有的创作人列表(去重,仅返回非空值,按名称升序)
+     *
+     * @return 创作人名称列表
+     */
+    @Override
+    public List<String> listAuthors() {
+        return lambdaQuery()
+                .eq(Plan::getDeleted, 0)
+                .isNotNull(Plan::getAuthorName)
+                .ne(Plan::getAuthorName, "")
+                .select(Plan::getAuthorName)
+                .groupBy(Plan::getAuthorName)
+                .orderByAsc(Plan::getAuthorName)
+                .list()
+                .stream()
+                .map(Plan::getAuthorName)
+                .filter(name -> StringUtils.hasText(name))
+                .distinct()
+                .collect(java.util.stream.Collectors.toList());
+    }
+
     /**
      * 保存方案步骤(设置 planId 和步骤序号后批量插入)
      *

+ 8 - 0
code/frontend/src/api/plan.js

@@ -8,6 +8,14 @@ export function getPlanPage(params) {
   return request.get('/plan/page', { params })
 }
 
+/**
+ * 获取数据库中已有的创作人列表(用于筛选下拉框)
+ * @returns {Promise<string[]>} 创作人名称列表
+ */
+export function getPlanAuthors() {
+  return request.get('/plan/authors')
+}
+
 /**
  * 查询方案详情(含步骤)
  * @param {string} id 方案ID

+ 11 - 5
code/frontend/src/views/plan/index.vue

@@ -20,7 +20,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="创作人">
-          <el-input v-model="queryForm.authorName" placeholder="请输入创作人" clearable style="width:150px" />
+          <el-select v-model="queryForm.authorName" placeholder="全部" clearable filterable style="width:150px">
+            <el-option v-for="name in authorOptions" :key="name" :label="name" :value="name" />
+          </el-select>
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="queryForm.status" placeholder="全部" clearable style="width:110px">
@@ -413,7 +415,8 @@ import {
   publishPlan,
   batchPublishPlan,
   offshelfPlan,
-  batchOffshelfPlan
+  batchOffshelfPlan,
+  getPlanAuthors
 } from '@/api/plan'
 import { getAcupointList } from '@/api/acupoint'
 import { getTechniqueList } from '@/api/moxibustion'
@@ -447,18 +450,21 @@ const userStore = useUserStore()
 // ============ 选项列表(用于选择框) ============
 const acupointOptions = ref([])
 const techniqueOptions = ref([])
+const authorOptions = ref([])
 
 /**
- * 加载穴位、手法选项列表
+ * 加载穴位、手法、创作人选项列表
  */
 async function loadOptions() {
   try {
-    const [acupointRes, techniqueRes] = await Promise.all([
+    const [acupointRes, techniqueRes, authorRes] = await Promise.all([
       getAcupointList(),
-      getTechniqueList()
+      getTechniqueList(),
+      getPlanAuthors().catch(() => ({ data: [] }))
     ])
     acupointOptions.value = acupointRes.data || []
     techniqueOptions.value = techniqueRes.data || []
+    authorOptions.value = authorRes.data || []
   } catch (e) {
     // 选项加载失败不影响主流程
   }