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 0288b39..ea1b8b4 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 @@ -55,9 +55,8 @@ public class TaskSetUpController extends BaseController { } //指标配置 - @PostMapping("/target") + @GetMapping("/target/{id}") public AjaxResult getTarget(@PathVariable Integer id){ - taskService.getTarget(id); - return AjaxResult.success(); + return AjaxResult.success(taskService.getTarget(id)); } } 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 eecf9f0..f1d7328 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 @@ -1,5 +1,6 @@ package tech.unissense.pms.business.examine.task.service; +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; @@ -14,5 +15,5 @@ public interface TaskService { void deleteTask(Integer id); - void getTarget(Integer id); + List getTarget(Integer id); } 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 8087d84..768627b 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 @@ -3,6 +3,9 @@ package tech.unissense.pms.business.examine.task.service.impl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import tech.unissense.pms.business.examine.config.domain.ExamineConfig; +import tech.unissense.pms.business.examine.config.mapper.ExamineConfigMapper; +import tech.unissense.pms.business.examine.config.service.ExamineConfigService; 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.mapper.ExamineTaskMapper; @@ -18,9 +21,20 @@ public class TaskServiceImpl implements TaskService { @Autowired private ExamineTaskMapper examineTaskDao; + @Autowired + private ExamineConfigMapper examineConfigMapper; + @Override public ExamineTask addTask(ExamineTask task) { examineTaskDao.addTask(task); + + ExamineConfig examineConfig = new ExamineConfig(); + examineConfig.setExamineTaskId(-1); + List list = examineConfigMapper.list(examineConfig); + list.forEach(item -> { + item.setExamineTaskId(task.getId()); + }); + examineConfigMapper.insertBatch(list); return task; } @@ -41,7 +55,9 @@ public class TaskServiceImpl implements TaskService { } @Override - public void getTarget(Integer id) { - + public List getTarget(Integer id) { + ExamineConfig examineConfig = new ExamineConfig(); + examineConfig.setExamineTaskId(id); + return examineConfigMapper.list(examineConfig); } } diff --git a/pms-business/src/main/resources/mapper/business/examine/ExamineConfigMapper.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineConfigMapper.xml index 6e13d52..b076575 100644 --- a/pms-business/src/main/resources/mapper/business/examine/ExamineConfigMapper.xml +++ b/pms-business/src/main/resources/mapper/business/examine/ExamineConfigMapper.xml @@ -116,25 +116,25 @@ - insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id) - values (#{reviewType}, #{reviewCategory}, #{reviewItem}, #{remarks}, #{weight}, #{examineTaskId}) + insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id, sort_num) + values (#{reviewType}, #{reviewCategory}, #{reviewItem}, #{remarks}, #{weight}, #{examineTaskId}, #{sortNum}) - insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id) + insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id, sort_num) values (#{entity.reviewType}, #{entity.reviewCategory}, #{entity.reviewItem}, #{entity.remarks}, #{entity.weight}, - #{entity.examineTaskId}) + #{entity.examineTaskId}, #{entity.sortNum}) - insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id) + insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id, sort_num) values (#{entity.reviewType}, #{entity.reviewCategory}, #{entity.reviewItem}, #{entity.remarks}, #{entity.weight}, - #{entity.examineTaskId}) + #{entity.examineTaskId}, #{entity.sortNum}) on duplicate key update review_type = values(review_type), @@ -143,6 +143,7 @@ remarks = values(remarks), weight = values(weight), examine_task_id = values(examine_task_id) + sort_num = values(sort_num)