This commit is contained in:
杜建超 2020-11-11 15:55:36 +08:00
parent 3ef469e4f0
commit e8dabe4763

View File

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