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 3e2a660c..9e8f1787 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 @@ -186,14 +186,21 @@ public class AssessManagerServiceImpl implements AssessManagerService { staffs.retainAll(change); List collect = staffs.stream().map(s -> Long.valueOf(s)).collect(toList()); collect.removeAll(longs); - groupStaffs.setStaffIds(collect); - groupS.add(groupStaffs); + if(CollectionUtils.isNotEmpty(collect)){ + groupStaffs.setStaffIds(collect); + groupS.add(groupStaffs); + } } StartGroups startGroups = new StartGroups(); startGroups.setStartId(req.getStartId()); startGroups.setGroups(groupS); - flowStartService.startStaffs(startGroups); + try { + flowStartService.startStaffs(startGroups); + } catch (Exception e) { + log.error("调用初始化失败"); + return R.error("初始化失败"); + } return R.ok(); diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index fd3c7dec..fdba51f8 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -451,7 +451,8 @@ - update lz_result_record set is_delete = 1 where + update lz_result_record set is_delete = 1,gmt_modified = now() + where is_delete = 0 and start_id = #{startId} and staff_id in ( diff --git a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml index f2c8754b..484d23ac 100644 --- a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml @@ -143,7 +143,7 @@ lz_evaluation_start_staff set score = 1, - ,gmt_modified = now() + gmt_modified = now() where is_delete = 0 and score = 0 and type = 0 and evaluation_id = #{evaluationId} and start_id = #{startId} @@ -154,7 +154,7 @@ lz_evaluation_start_staff set is_delete = 1, - ,gmt_modified = now() + gmt_modified = now() where is_delete = 0 and type = 0 and start_id = #{startId} and staff_id in (