diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/mapper/ExamineRemarkMapper.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/mapper/ExamineRemarkMapper.java index cc10c52..e49c55e 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/mapper/ExamineRemarkMapper.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/mapper/ExamineRemarkMapper.java @@ -47,4 +47,7 @@ public interface ExamineRemarkMapper { int batchRemove(Integer[] ids); void insertOrUpdateBatch(List examineRemarkList); + + void deleteByTaskId(Integer taskId); + } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/service/IExamineRemarkService.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/service/IExamineRemarkService.java index ff5fe8d..b22bd42 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/service/IExamineRemarkService.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/service/IExamineRemarkService.java @@ -44,6 +44,7 @@ public interface IExamineRemarkService { void saveBatch(List examineRemarkList); + void deleteByTaskId(Integer id); } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/service/impl/ExamineRemarkServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/service/impl/ExamineRemarkServiceImpl.java index c9762bd..2cbd173 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/service/impl/ExamineRemarkServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/remark/service/impl/ExamineRemarkServiceImpl.java @@ -73,6 +73,11 @@ public class ExamineRemarkServiceImpl implements IExamineRemarkService { examineRemarkMapper.insertOrUpdateBatch(examineRemarkList); } + @Override + public void deleteByTaskId(Integer taskId) { + examineRemarkMapper.deleteByTaskId(taskId); + } + } 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 6c5569f..3af6d74 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 @@ -11,6 +11,8 @@ import tech.unissense.pms.business.examine.config.enums.ReviewTypeEnum; import tech.unissense.pms.business.examine.config.mapper.ExamineConfigMapper; import tech.unissense.pms.business.examine.detail.domain.ExamineDetail; import tech.unissense.pms.business.examine.detail.service.ExamineDetailService; +import tech.unissense.pms.business.examine.remark.service.IExamineRemarkService; +import tech.unissense.pms.business.examine.remark.service.impl.ExamineRemarkServiceImpl; import tech.unissense.pms.business.examine.task.domain.ExamineTask; import tech.unissense.pms.business.examine.task.domain.ExamineTaskDto; import tech.unissense.pms.business.examine.task.domain.TaskQueryDto; @@ -49,6 +51,8 @@ public class TaskServiceImpl implements TaskService { private ExamineUserServiceImpl examineUserService; @Autowired private ExamineDetailService detailService; + @Autowired + private IExamineRemarkService examineRemarkService; @Override public ExamineTask addTask(ExamineTask task) { @@ -118,6 +122,10 @@ public class TaskServiceImpl implements TaskService { item.setExamineTaskId(updatedTask.getId()); }); examineConfigMapper.insertBatch(list); + + // 清空个人详情 + userMapper.clearUserByTaskId(updatedTask.getId()); + examineRemarkService.deleteByTaskId(updatedTask.getId()); } examineTaskDao.updateTask(updatedTask); @@ -189,6 +197,7 @@ public class TaskServiceImpl implements TaskService { examineTask.setTaskStatus(0); } } + //todo 排序有问题 return examineTasks.stream().collect(Collectors.groupingBy(ExamineTask::getTaskStatus)); } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/ExamineUserMapper.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/ExamineUserMapper.java index ec31959..0f22244 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/ExamineUserMapper.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/ExamineUserMapper.java @@ -78,5 +78,6 @@ public interface ExamineUserMapper { void deleteByIdList(List idList); + void clearUserByTaskId(Integer id); } diff --git a/pms-business/src/main/resources/mapper/ExamineRemark/ExamineRemarkMapper.xml b/pms-business/src/main/resources/mapper/ExamineRemark/ExamineRemarkMapper.xml index 848c849..0cb8ac1 100644 --- a/pms-business/src/main/resources/mapper/ExamineRemark/ExamineRemarkMapper.xml +++ b/pms-business/src/main/resources/mapper/ExamineRemark/ExamineRemarkMapper.xml @@ -129,6 +129,9 @@ #{id} + + delete from pms_examine_remark where task_id=#{taskId} + diff --git a/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml index 968fb88..025f310 100644 --- a/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml +++ b/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml @@ -80,6 +80,7 @@ left join pms_examine_task t2 on t1.task_id=t2.id where user_id=#{userId} + order by t2.create_time desc diff --git a/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml index 0a00535..8958776 100644 --- a/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml +++ b/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml @@ -70,6 +70,7 @@ t1.user_id, t1.score, t1.judge_content, + t1.self_judge_content, t1.manage_score, t1.examine_status, t1.examine_status_self, @@ -203,6 +204,11 @@ #{id} + + update pms_examine_user + set score=null,judge_content=null,manage_score=null,examine_status=0,examine_status_self=0,self_score=null + where task_id=#{id} +