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 15:55:36 +08:00
parent 3ef469e4f0
commit e8dabe4763
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
View File

@ -378,18 +378,28 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
private int removeStaffsToAssessGroup(List<String> ids,EvaluationGroup group) { private int removeStaffsToAssessGroup(List<String> ids,EvaluationGroup group) {
String staffIds = group.getStaffIds(); String staffIds = group.getStaffIds();
if(StringUtil.isNotBlank(staffIds)){ String outIds = group.getOutIds();
String[] split = staffIds.split(","); //删除选中人员
Set<String> set = new HashSet(Arrays.asList(split)); if(StringUtil.isNotBlank(staffIds)){
set.removeAll(new HashSet(ids)); //set.addAll(new HashSet(ids)); String[] staffs = staffIds.split(",");
String join = StringUtils.join(set, ","); Set<String> staffsSet = new HashSet(Arrays.asList(staffs));
group.setStaffIds(join); staffsSet.removeAll(ids);
int i = evaluationGroupMapper.updateCoverEvaluationGroupById(group); group.setStaffIds(StringUtils.join(staffsSet, ","));
return i;
} }
return 0;
}
//增加排除人员
if(StringUtil.isBlank(outIds)){
group.setOutIds(StringUtils.join(ids, ","));
}
else {
String[] outs = outIds.split(",");
Set<String> outsSet = new HashSet(Arrays.asList(outs));
outsSet.addAll(ids);
group.setOutIds(StringUtils.join(outsSet, ","));
}
return evaluationGroupMapper.updateById(group);
}
@Override @Override
public String getEvaluationCopyIdsByEvaluationIds(String evaluationIds,Long startId) { public String getEvaluationCopyIdsByEvaluationIds(String evaluationIds,Long startId) {
@ -402,4 +412,5 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
} }
return StringUtils.join(ids,","); return StringUtils.join(ids,",");
} }
} }