Browse Source

绩效评价-评价计划分组返回核查组长信息

master
CMM 1 year ago
parent
commit
f34c86bac4
2 changed files with 15 additions and 0 deletions
  1. +12
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
  2. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/performance/model/vo/PerformanceAppraisalProjectGroupVO.java

+ 12
- 0
pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java View File

@@ -224,6 +224,10 @@ public class PerformanceAppraisalPlanManage {
List<UserFullInfoDTO> verificationUsers = Arrays.stream(verificationUsersStr.split(StrPool.COMMA))
.map(userInfoHelper::getUserFullInfoByEmployeeCode).collect(Collectors.toList());
groupVo.setVerificationUsers(verificationUsers);
if (StringUtils.isNotBlank(g.getVerifyLeader())){
UserFullInfoDTO dto = userInfoHelper.getUserFullInfoByEmployeeCode(g.getVerifyLeader());
groupVo.setVerifyLeader(dto);
}
groupVo.setCreateOn(g.getCreateOn());
return groupVo;
}).collect(Collectors.toList());
@@ -538,6 +542,10 @@ public class PerformanceAppraisalPlanManage {
vo.setProjects(checkProject(g.getProjectCodes(), finalProjectMap));
vo.setReAppraisalUsers(checkUser(g.getReAppraisalUsers(), finalUserMap));
vo.setVerificationUsers(checkUser(g.getVerificationUsers(), finalUserMap));
if (StringUtils.isNotBlank(g.getVerifyLeader())){
UserFullInfoDTO userFullInfoDto = finalUserMap.get(g.getVerifyLeader());
vo.setVerifyLeader(userFullInfoDto);
}
return vo;
}).collect(Collectors.toList());
}
@@ -589,6 +597,10 @@ public class PerformanceAppraisalPlanManage {
vo.setProjects(checkProject(group.getProjectCodes(), projectMap));
vo.setReAppraisalUsers(checkUser(group.getReAppraisalUsers(), userMap));
vo.setVerificationUsers(checkUser(group.getVerificationUsers(), userMap));
if (StringUtils.isNotBlank(group.getVerifyLeader())){
UserFullInfoDTO dto = userMap.get(group.getVerifyLeader());
vo.setVerifyLeader(dto);
}
return vo;
}



+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/performance/model/vo/PerformanceAppraisalProjectGroupVO.java View File

@@ -43,4 +43,7 @@ public class PerformanceAppraisalProjectGroupVO implements Serializable {

@ApiModelProperty("核查人员")
private List<UserFullInfoDTO> verificationUsers;

@ApiModelProperty("核查组长")
private UserFullInfoDTO verifyLeader;
}

Loading…
Cancel
Save