From 3519ff2b013d0abc4e6150e7f519bd4ecf2b53ac Mon Sep 17 00:00:00 2001
From: admin <1628672303@qq.com>
Date: Mon, 15 May 2023 09:45:03 +0800
Subject: [PATCH] 5-15

---
 .../src/views/taskSkill/TaskSkillList.vue     | 12 +++----
 .../controller/TaskSkillController.java       | 32 +++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue b/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue
index c048e72..26108be 100644
--- a/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue
+++ b/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue
@@ -9,11 +9,11 @@
               <j-search-select-tag placeholder="请输入技能名称" v-model="queryParam.skillId" dict="skill_points,skill_name,id"></j-search-select-tag>
             </a-form-item>
           </a-col>
-<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--            <a-form-item label="任务名称">-->
-<!--              <a-input placeholder="请输入任务名称" v-model="queryParam.taskId"></a-input>-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务名称">
+              <a-input placeholder="请输入任务名称" v-model="queryParam.taskId"></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -142,7 +142,7 @@
             dataIndex: 'taskType_dictText'
           },
           {
-            title:'任务',
+            title:'任务名称',
             align:"center",
             dataIndex: 'taskId'
           },
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java
index 4a88ea0..a2b9da8 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.taskSkill.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -83,7 +84,38 @@ public class TaskSkillController extends JeecgController<TaskSkill, ITaskSkillSe
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		List<String> strings = new ArrayList<>();
+		if (taskSkill.getTaskId() != null){
+			List<Projectx> projectlist = projectxService.list(new QueryWrapper<Projectx>().lambda().like(Projectx::getProjectName, taskSkill.getTaskId()));
+			List<Modulex> modulelist = modulexService.list(new QueryWrapper<Modulex>().lambda().like(Modulex::getModuleName, taskSkill.getTaskId()));
+			List<Functionx> functionlist = functionxService.list(new QueryWrapper<Functionx>().lambda().like(Functionx::getFunctionName, taskSkill.getTaskId()));
+			List<Rulex> rulelist = rulexService.list(new QueryWrapper<Rulex>().lambda().like(Rulex::getRuleCode, taskSkill.getTaskId()));
+			if (!projectlist.isEmpty()){
+				for (Projectx projectx : projectlist){
+					strings.add(projectx.getId());
+				}
+			}
+			if (!modulelist.isEmpty()){
+				for (Modulex modulex : modulelist){
+					strings.add(modulex.getId());
+				}
+			}
+			if (!functionlist.isEmpty()){
+				for (Functionx functionx : functionlist){
+					strings.add(functionx.getId());
+				}
+			}
+			if (!rulelist.isEmpty()){
+				for (Rulex rulex : rulelist){
+					strings.add(rulex.getId());
+				}
+			}
+			taskSkill.setTaskId(null);
+		}
 		QueryWrapper<TaskSkill> queryWrapper = QueryGenerator.initQueryWrapper(taskSkill, req.getParameterMap());
+		if (!strings.isEmpty()){
+			queryWrapper.in("task_id",strings);
+		}
 		Page<TaskSkill> page = new Page<TaskSkill>(pageNo, pageSize);
 		IPage<TaskSkill> pageList = taskSkillService.page(page, queryWrapper);
 		for (TaskSkill taskSkill1 : pageList.getRecords()){