diff --git a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java index e76fdac..f153c2b 100644 --- a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java +++ b/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 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 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)); diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/ExamineTask.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/ExamineTask.java index c457d84..ce55dbf 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/ExamineTask.java +++ b/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 userIdList; + + private Integer year; } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/TaskQueryDto.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/TaskQueryDto.java index e723e89..d189d2b 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/domain/TaskQueryDto.java +++ b/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; } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/TaskService.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/TaskService.java index bca4818..cd73771 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/TaskService.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/TaskService.java @@ -19,4 +19,6 @@ public interface TaskService { List getTarget(Integer id); Map> listTask(TaskQueryDto queryDto); + + List updateConfigTask(List list); } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java index 5a7a04a..fca66ae 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java @@ -48,7 +48,7 @@ public class TaskServiceImpl implements TaskService { //生成考核人员信息 List userIdList = task.getUserIdList(); Assert.notEmpty(userIdList, "考核人员不能为空"); - List userList=new ArrayList<>(); + List userList = new ArrayList<>(); for (Integer userId : userIdList) { ExamineUser examineUser = new ExamineUser(); examineUser.setTaskId(task.getId()); @@ -61,7 +61,17 @@ public class TaskServiceImpl implements TaskService { @Override public List getTasks(TaskQueryDto queryDto) { - return examineTaskDao.getTasks(queryDto); + List tasks = examineTaskDao.getTasks(queryDto); + tasks.forEach(item -> { + ExamineUser examineUser = new ExamineUser(); + examineUser.setTaskId(item.getId()); + List existingUsers = userMapper.list(examineUser); + List existingUserIds = existingUsers.stream() + .map(ExamineUser::getUserId) + .collect(Collectors.toList()); + item.setUserIdList(existingUserIds); + }); + return tasks; } @Override @@ -97,6 +107,20 @@ public class TaskServiceImpl implements TaskService { @Override public void deleteTask(Integer id) { examineTaskDao.deleteTask(id); + ExamineConfig examineConfig = new ExamineConfig(); + examineConfig.setExamineTaskId(id); + List list = examineConfigMapper.list(examineConfig); + for (ExamineConfig config : list) { + examineConfigMapper.deleteById(config.getId()); + } + + ExamineUser examineUser = new ExamineUser(); + examineUser.setTaskId(id); + List existingUsers = userMapper.list(examineUser); + for (ExamineUser existingUser : existingUsers) { + userMapper.deleteById(existingUser.getId()); + } + } @Override @@ -108,7 +132,7 @@ public class TaskServiceImpl implements TaskService { @Override @DataScope(deptAlias = "t3", userAlias = "t2") - public Map> listTask(TaskQueryDto queryDto) { + public Map> listTask(TaskQueryDto queryDto) { List examineTasks = examineTaskDao.listTask(queryDto); LocalDateTime now = LocalDateTime.now(); for (ExamineTask examineTask : examineTasks) { @@ -127,4 +151,15 @@ public class TaskServiceImpl implements TaskService { } return examineTasks.stream().collect(Collectors.groupingBy(ExamineTask::getTaskStatus)); } + + @Override + public List updateConfigTask(List list) { + for (ExamineConfig examineConfig : list) { + if (examineConfig.getId() == null) { + continue; + } + examineConfigMapper.update(examineConfig); + } + return list; + } }