diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 05e84212..2d395eec 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -523,7 +523,7 @@ public class FlowStartServiceImpl extends ServiceImpl 0){//模板里面有添加指标 for (ResultTagetLibDto libDto: modelDto.getTagetLibs()) { @@ -545,6 +545,7 @@ public class FlowStartServiceImpl extends ServiceImpl 0){ // resultDetailService.saveBatch(resultDetails); diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index c00aea26..d81a71fd 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -273,8 +273,10 @@ public class AssessManagerServiceImpl implements AssessManagerService { if(req.getChangeType() == 1 && CollectionUtils.isNotEmpty(change)){ //删除钉钉任务 try { - List resultRecords = resultRecordMapper.selectResultRecordsByStartIdAndStaffIds(req.getStartId(),change); + List resultRecords = + resultRecordMapper.selectResultRecordsByStartIdAndStaffIds(req.getStartId(),change); Map> rIdAndStaffIds = new HashMap<>(); + List removeGroup = new ArrayList<>(); List recordIds = resultRecords.stream().map(new Function() { @Override public Long apply(ResultRecord resultRecord) { @@ -306,16 +308,28 @@ public class AssessManagerServiceImpl implements AssessManagerService { //这次全部删除了该考评组下面的人,那么删除考评组对应的start里面的信息 for (Long id:ids ) { - if(id == groupResultRecordStaffsCount.getEvaluationId()){ + if(id.compareTo(groupResultRecordStaffsCount.getEvaluationId()) == 0 ){ ids.remove(id); + EvaluationGroup evaluationGroup = new EvaluationGroup(); + evaluationGroup.setIsDelete(1); + evaluationGroup.setId(id); + evaluationGroup.setGmtModified(new Date()); + removeGroup.add(evaluationGroup); break; } } } } - if(ids.size() != split.length){//更新考核组信息 - flowStart.setGroupIds(String.join(",", ids.toString())); + log.info("ids.size={}与split.length={}", ids.size(), split.length); + log.info("删除的发起中考评组个数", removeGroup.size()); + if(removeGroup.size() > 0){//更新考核组信息 + String group = String.join(",", ids.toString()). + replace("[", ""). + replace("]", ""); + flowStart.setGroupIds(group); + log.info("新的start对应的groupId{}", flowStart.getGroupIds()); flowStartService.updateFlowStartById(flowStart); + evaluationGroupService.updateBatchById(removeGroup); } } catch (Exception e) { log.error("调用钉钉清除任务异常,e:" ,e); diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 06e0bf36..1703c2fc 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -663,7 +663,7 @@ ) - select * from lz_result_record where is_delete = 0 and start_id = #{startId} and staff_id in ( @@ -674,13 +674,13 @@ - select evaluation_id, count(evaluation_id) as count from lz_result_record where is_delete = 0 and start_id = #{startId} group by evaluation_id - select * from lz_result_record where is_delete = 0 and evaluation_id in (