feat: 联调完善1

# Conflicts:
#	pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java

pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java

@@ -4,6 +4,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import tech.unissense.pms.business.examine.config.domain.ExamineConfig;
 import tech.unissense.pms.business.examine.task.domain.ExamineTask;
 import tech.unissense.pms.business.examine.task.domain.TaskQueryDto;
 import tech.unissense.pms.business.examine.task.service.TaskService;
@@ -36,6 +37,7 @@ public class TaskSetUpController extends BaseController {
         List<ExamineTask> tasks = taskService.getTasks(queryDto);
         return getDataTable(tasks);
     }
+
     @GetMapping("/list")
     public AjaxResult listTask(TaskQueryDto queryDto) {
         return success(taskService.listTask(queryDto));
@@ -51,6 +53,12 @@ public class TaskSetUpController extends BaseController {
         return AjaxResult.success(taskService.updateTask(updatedTask));
     }
 
+    // 编辑任务
+    @PutMapping("/config/update")
+    public AjaxResult updateConfigTask(@RequestBody List<ExamineConfig> list) {
+        return AjaxResult.success(taskService.updateConfigTask(list));
+    }
+
     // 删除任务
     @DeleteMapping("/{id}")
     public AjaxResult deleteTask(@PathVariable Integer id) {
@@ -58,7 +66,7 @@ public class TaskSetUpController extends BaseController {
         return AjaxResult.success();
     }
 
-    //指标配置
+    //获取指标配置
     @GetMapping("/target/{id}")
     public AjaxResult getTarget(@PathVariable Integer id){
         return AjaxResult.success(taskService.getTarget(id));

pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/ExamineTask.java

@@ -40,5 +40,7 @@ public class ExamineTask implements Serializable  {
 
 
     private List<Integer> userIdList;
+
+    private Integer year;
 }
 

pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/TaskQueryDto.java

@@ -8,4 +8,6 @@ public class TaskQueryDto extends BaseEntity {
     private String taskName;
 
     private Integer taskStatus;
+
+    private Integer year;
 }

pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/TaskService.java

@@ -19,4 +19,6 @@ public interface TaskService {
     List<ExamineConfig> getTarget(Integer id);
 
     Map<Integer,List<ExamineTask>> listTask(TaskQueryDto queryDto);
+
+    List<ExamineConfig> updateConfigTask(List<ExamineConfig> list);
 }

pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java

@@ -34,6 +34,8 @@ public class TaskServiceImpl implements TaskService {
 
     @Resource
     private ExamineUserMapper userMapper;
+
+    @Autowired
     private ExamineUserServiceImpl examineUserService;
 
     @Override
@@ -50,7 +52,7 @@ public class TaskServiceImpl implements TaskService {
         //生成考核人员信息
         List<Integer> userIdList = task.getUserIdList();
         Assert.notEmpty(userIdList, "考核人员不能为空");
-        List<ExamineUser> userList=new ArrayList<>();
+        List<ExamineUser> userList = new ArrayList<>();
         for (Integer userId : userIdList) {
             ExamineUser examineUser = new ExamineUser();
             examineUser.setTaskId(task.getId());
@@ -63,7 +65,17 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     public List<ExamineTask> getTasks(TaskQueryDto queryDto) {
-        return examineTaskDao.getTasks(queryDto);
+        List<ExamineTask> tasks = examineTaskDao.getTasks(queryDto);
+        tasks.forEach(item -> {
+            ExamineUser examineUser = new ExamineUser();
+            examineUser.setTaskId(item.getId());
+            List<ExamineUser> existingUsers = userMapper.list(examineUser);
+            List<Integer> existingUserIds = existingUsers.stream()
+                    .map(ExamineUser::getUserId)
+                    .collect(Collectors.toList());
+            item.setUserIdList(existingUserIds);
+        });
+        return tasks;
     }
 
     @Override
@@ -100,6 +112,12 @@ public class TaskServiceImpl implements TaskService {
     public void deleteTask(Integer id) {
         examineTaskDao.deleteTask(id);
         examineUserService.deleteUserByTaskId(id);
+        ExamineConfig examineConfig = new ExamineConfig();
+        examineConfig.setExamineTaskId(id);
+        List<ExamineConfig> list = examineConfigMapper.list(examineConfig);
+        for (ExamineConfig config : list) {
+            examineConfigMapper.deleteById(config.getId());
+        }
     }
 
     @Override
@@ -111,7 +129,7 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     @DataScope(deptAlias = "t3", userAlias = "t2")
-    public Map<Integer,List<ExamineTask>> listTask(TaskQueryDto queryDto) {
+    public Map<Integer, List<ExamineTask>> listTask(TaskQueryDto queryDto) {
         List<ExamineTask> examineTasks = examineTaskDao.listTask(queryDto);
         LocalDateTime now = LocalDateTime.now();
         for (ExamineTask examineTask : examineTasks) {
@@ -130,4 +148,15 @@ public class TaskServiceImpl implements TaskService {
         }
         return examineTasks.stream().collect(Collectors.groupingBy(ExamineTask::getTaskStatus));
     }
+
+    @Override
+    public List<ExamineConfig> updateConfigTask(List<ExamineConfig> list) {
+        for (ExamineConfig examineConfig : list) {
+            if (examineConfig.getId() == null) {
+                continue;
+            }
+            examineConfigMapper.update(examineConfig);
+        }
+        return list;
+    }
 }

pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml

@@ -27,6 +27,9 @@
             <if test="taskStatus != null">
                 AND task_status = #{taskStatus}
             </if>
+            <if test="year != null">
+                AND year = #{year}
+            </if>
         </where>
     </select>
     <select id="listTask" resultType="ExamineTask">