From f34c86bac49a64bc6dcffd524b5f13934cc0f8d9 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Sat, 12 Aug 2023 13:55:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=AF=84=E4=BB=B7-=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E8=AE=A1=E5=88=92=E5=88=86=E7=BB=84=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E7=BB=84=E9=95=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performance/manage/PerformanceAppraisalPlanManage.java | 12 ++++++++++++ .../model/vo/PerformanceAppraisalProjectGroupVO.java | 3 +++ 2 files changed, 15 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java index 30dfe1f..09cd1a6 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java @@ -224,6 +224,10 @@ public class PerformanceAppraisalPlanManage { List 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; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/model/vo/PerformanceAppraisalProjectGroupVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/model/vo/PerformanceAppraisalProjectGroupVO.java index 333e8a4..ad6cac2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/model/vo/PerformanceAppraisalProjectGroupVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/model/vo/PerformanceAppraisalProjectGroupVO.java @@ -43,4 +43,7 @@ public class PerformanceAppraisalProjectGroupVO implements Serializable { @ApiModelProperty("核查人员") private List verificationUsers; + + @ApiModelProperty("核查组长") + private UserFullInfoDTO verifyLeader; }