feat(examine): 添加删除备注和清空用户信息功能
- 在 ExamineRemarkMapper 中添加 deleteByTaskId 方法,用于删除指定任务的备注 - 在 ExamineRemarkServiceImpl 中实现 deleteByTaskId 方法 - 在 IExamineRemarkService 中添加 deleteByTaskId 接口 - 在 TaskServiceImpl 中调用 deleteByTaskId 方法以删除任务备注 - 在 ExamineUserMapper 中添加 clearUserByTaskId 方法,用于清空指定任务的用户信息 - 在 ExamineUserMapper.xml 中实现 clearUserByTaskId 方法的 SQL 语句- 修改 TaskServiceImpl 中的 updateTask 方法,添加清空用户信息和删除备注的逻辑 - 修改 ExamineTaskMapper.xml 中的查询语句,按创建时间降序排序任务dev_1.2.1
parent
c03486036f
commit
262218c161
|
@ -47,4 +47,7 @@ public interface ExamineRemarkMapper {
|
||||||
int batchRemove(Integer[] ids);
|
int batchRemove(Integer[] ids);
|
||||||
|
|
||||||
void insertOrUpdateBatch(List<ExamineRemark> examineRemarkList);
|
void insertOrUpdateBatch(List<ExamineRemark> examineRemarkList);
|
||||||
|
|
||||||
|
void deleteByTaskId(Integer taskId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,6 +44,7 @@ public interface IExamineRemarkService {
|
||||||
|
|
||||||
void saveBatch(List<ExamineRemark> examineRemarkList);
|
void saveBatch(List<ExamineRemark> examineRemarkList);
|
||||||
|
|
||||||
|
void deleteByTaskId(Integer id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -73,6 +73,11 @@ public class ExamineRemarkServiceImpl implements IExamineRemarkService {
|
||||||
examineRemarkMapper.insertOrUpdateBatch(examineRemarkList);
|
examineRemarkMapper.insertOrUpdateBatch(examineRemarkList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteByTaskId(Integer taskId) {
|
||||||
|
examineRemarkMapper.deleteByTaskId(taskId);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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.config.mapper.ExamineConfigMapper;
|
||||||
import tech.unissense.pms.business.examine.detail.domain.ExamineDetail;
|
import tech.unissense.pms.business.examine.detail.domain.ExamineDetail;
|
||||||
import tech.unissense.pms.business.examine.detail.service.ExamineDetailService;
|
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.ExamineTask;
|
||||||
import tech.unissense.pms.business.examine.task.domain.ExamineTaskDto;
|
import tech.unissense.pms.business.examine.task.domain.ExamineTaskDto;
|
||||||
import tech.unissense.pms.business.examine.task.domain.TaskQueryDto;
|
import tech.unissense.pms.business.examine.task.domain.TaskQueryDto;
|
||||||
|
@ -49,6 +51,8 @@ public class TaskServiceImpl implements TaskService {
|
||||||
private ExamineUserServiceImpl examineUserService;
|
private ExamineUserServiceImpl examineUserService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ExamineDetailService detailService;
|
private ExamineDetailService detailService;
|
||||||
|
@Autowired
|
||||||
|
private IExamineRemarkService examineRemarkService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ExamineTask addTask(ExamineTask task) {
|
public ExamineTask addTask(ExamineTask task) {
|
||||||
|
@ -118,6 +122,10 @@ public class TaskServiceImpl implements TaskService {
|
||||||
item.setExamineTaskId(updatedTask.getId());
|
item.setExamineTaskId(updatedTask.getId());
|
||||||
});
|
});
|
||||||
examineConfigMapper.insertBatch(list);
|
examineConfigMapper.insertBatch(list);
|
||||||
|
|
||||||
|
// 清空个人详情
|
||||||
|
userMapper.clearUserByTaskId(updatedTask.getId());
|
||||||
|
examineRemarkService.deleteByTaskId(updatedTask.getId());
|
||||||
}
|
}
|
||||||
examineTaskDao.updateTask(updatedTask);
|
examineTaskDao.updateTask(updatedTask);
|
||||||
|
|
||||||
|
@ -189,6 +197,7 @@ public class TaskServiceImpl implements TaskService {
|
||||||
examineTask.setTaskStatus(0);
|
examineTask.setTaskStatus(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//todo 排序有问题
|
||||||
return examineTasks.stream().collect(Collectors.groupingBy(ExamineTask::getTaskStatus));
|
return examineTasks.stream().collect(Collectors.groupingBy(ExamineTask::getTaskStatus));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -78,5 +78,6 @@ public interface ExamineUserMapper {
|
||||||
|
|
||||||
void deleteByIdList(List<Integer> idList);
|
void deleteByIdList(List<Integer> idList);
|
||||||
|
|
||||||
|
void clearUserByTaskId(Integer id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -129,6 +129,9 @@
|
||||||
#{id}
|
#{id}
|
||||||
</foreach>
|
</foreach>
|
||||||
</delete>
|
</delete>
|
||||||
|
<delete id="deleteByTaskId">
|
||||||
|
delete from pms_examine_remark where task_id=#{taskId}
|
||||||
|
</delete>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,7 @@
|
||||||
left join pms_examine_task t2
|
left join pms_examine_task t2
|
||||||
on t1.task_id=t2.id
|
on t1.task_id=t2.id
|
||||||
where user_id=#{userId}
|
where user_id=#{userId}
|
||||||
|
order by t2.create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="updateTask">
|
<update id="updateTask">
|
||||||
|
|
|
@ -70,6 +70,7 @@
|
||||||
t1.user_id,
|
t1.user_id,
|
||||||
t1.score,
|
t1.score,
|
||||||
t1.judge_content,
|
t1.judge_content,
|
||||||
|
t1.self_judge_content,
|
||||||
t1.manage_score,
|
t1.manage_score,
|
||||||
t1.examine_status,
|
t1.examine_status,
|
||||||
t1.examine_status_self,
|
t1.examine_status_self,
|
||||||
|
@ -203,6 +204,11 @@
|
||||||
#{id}
|
#{id}
|
||||||
</foreach>
|
</foreach>
|
||||||
</delete>
|
</delete>
|
||||||
|
<delete id="clearUserByTaskId">
|
||||||
|
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}
|
||||||
|
</delete>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue