wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-11-11 10:47:13 +08:00
parent 0e7de159e6
commit 401bf91d68
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
View File

@ -188,7 +188,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
String[] split = flowStart.getGroupIds().split(",");
List<String> strings = Arrays.asList(split);
List<Long> ids = strings.stream().map(s -> Long.valueOf(s)).collect(toList());
List<EvaluationGroup> otheEvaluationGroups = evaluationGroupService.selectEvaluationGroupByNotIds(ids);
List<EvaluationGroup> evaluationGroups = evaluationGroupService.selectEvaluationGroupByIds(ids);
//获取变更人员
String[] changeStaffIds = req.getStaffIds().split(",");
@ -200,7 +200,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
//根据组id成员分组
Map<Long,List<String>> map = Maps.newHashMap();
for(EvaluationGroup group:otheEvaluationGroups){
for(EvaluationGroup group:evaluationGroups){
List<String> staff = evaluationGroupService.selectAllStaffIdsByGroupId(group.getId());
all.addAll(staff);
map.put(group.getId(),staff);
@ -227,7 +227,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
//排除已发起过的
List<Long> longs = evaluationStartStaffMapper.selectStaffIdsByStart(req.getStartId());
for(EvaluationGroup group:otheEvaluationGroups){
for(EvaluationGroup group:evaluationGroups){
GroupStaffs groupStaffs = new GroupStaffs();
groupStaffs.setEvaluationGroup(group);
@ -240,11 +240,17 @@ public class AssessManagerServiceImpl implements AssessManagerService {
groupS.add(groupStaffs);
}
}
if(CollectionUtils.isEmpty(groupS)){
log.info("暂无人员需要添加");
return R.ok("暂无人员需要添加");
}
StartGroups startGroups = new StartGroups();
startGroups.setStartId(req.getStartId());
startGroups.setGroups(groupS);
return flowStartService.startStaffs(startGroups);
R r = flowStartService.startStaffs(startGroups);
log.info("添加人员初始化返回：" + JSON.toJSONString(r));
return r;
}
if(req.getChangeType() == 1){