diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java index 297e1830..ce4e07b1 100644 --- a/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java @@ -44,4 +44,6 @@ public interface EvaluationStartStaffMapper extends BaseMapper staffIds); + + List selectStaffIdsByStart(@Param("startId") Long startId); } \ No newline at end of file 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 9f8bdd7e..334b870f 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 @@ -167,20 +167,25 @@ public class AssessManagerServiceImpl implements AssessManagerService { //初始化添加用户的数据 List groupS = new ArrayList<>(); + //排除已发起过的 + List longs = evaluationStartStaffMapper.selectStaffIdsByStart(req.getStartId()); + for(EvaluationGroup group:evaluationGroups){ + GroupStaffs groupStaffs = new GroupStaffs(); + groupStaffs.setEvaluationGroup(group); + List staffs = map.get(group.getId()); staffs.retainAll(notInGroup); - map.put(group.getId(),staffs); - GroupStaffs groupStaffs = new GroupStaffs(); - groupStaffs.setGroupId(group.getId()); + List collect = staffs.stream().map(s -> Long.valueOf(s)).collect(toList()); + collect.removeAll(longs); groupStaffs.setStaffIds(collect); groupS.add(groupStaffs); } StartGroups startGroups = new StartGroups(); startGroups.setStartId(req.getStartId()); - startGroups.setStaffIds(groupS); + startGroups.setGroups(groupS); flowStartService.startStaffs(startGroups); return ok; diff --git a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml index 487c2e01..f2c8754b 100644 --- a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml @@ -163,5 +163,9 @@ ) + +