Ver código fonte

绩效评价-评价计划分组保存校验修改

tags/24080901
CMM 1 ano atrás
pai
commit
590b220299
1 arquivos alterados com 12 adições e 3 exclusões
  1. +12
    -3
      pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java

+ 12
- 3
pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java Ver arquivo

@@ -634,7 +634,16 @@ public class PerformanceAppraisalPlanManage {
List<String> projectCodeList = groupList.stream()
.map(PerformanceAppraisalProjectGroup::getProjectCodes)
.collect(Collectors.toList());
checkProjectCodes(dto.getProjectCodes(),projectCodeList);
List<String> compareCodes = Lists.newArrayList();
for (String projectCode : projectCodeList) {
if (projectCode.contains(StrPool.COMMA)){
List<String> codes = Arrays.asList(projectCode.split(StrPool.COMMA));
compareCodes.addAll(codes);
}else {
compareCodes.add(projectCode);
}
}
checkProjectCodes(dto.getProjectCodes(),compareCodes);
group.setProjectCodes(String.join(StrPool.COMMA, dto.getProjectCodes()));
}
if(CollUtil.isNotEmpty(dto.getReAppraisalUsers())){
@@ -652,7 +661,7 @@ public class PerformanceAppraisalPlanManage {
compareUsers.add(reUser);
}
}
checkReAppraisalAndVerifyUsers(dto.getReAppraisalUsers(),reUserList,CommonConst.REAPPRAISAL_TYPE);
checkReAppraisalAndVerifyUsers(dto.getReAppraisalUsers(),compareUsers,CommonConst.REAPPRAISAL_TYPE);
group.setReAppraisalUsers(String.join(StrPool.COMMA, dto.getReAppraisalUsers()));
}
if(CollUtil.isNotEmpty(dto.getVerificationUsers())){
@@ -670,7 +679,7 @@ public class PerformanceAppraisalPlanManage {
compareUsers.add(verifyUser);
}
}
checkReAppraisalAndVerifyUsers(dto.getVerificationUsers(),verifyList,CommonConst.VERIFY_TYPE);
checkReAppraisalAndVerifyUsers(dto.getVerificationUsers(),compareUsers,CommonConst.VERIFY_TYPE);
group.setVerificationUsers(String.join(StrPool.COMMA, dto.getVerificationUsers()));
}
group.setUpdateOn(LocalDateTime.now());


Carregando…
Cancelar
Salvar