From 59983d302f6dbd503ccd0e224daa06bb161abe98 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Fri, 11 Aug 2023 17:06:04 +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=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/performance/controller/VerifyController.java | 2 +- .../pmapi/performance/manage/PerformanceAppraisalPlanManage.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/controller/VerifyController.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/controller/VerifyController.java index 09153bb..b68015e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/controller/VerifyController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/controller/VerifyController.java @@ -41,7 +41,7 @@ public class VerifyController { return verifyManage.groupProjectList(groupId,req); } - @PostMapping("/submit-reAppraisal") + @PostMapping("/submit-verify") @ApiOperation("提交核查") public String submitVerify(@Valid @RequestBody ProjectAppraisalDTO param){ return verifyManage.submitVerify(param); 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 daa7e48..b0f8269 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 @@ -476,6 +476,9 @@ public class PerformanceAppraisalPlanManage { List paas = performanceAppraisalApplicationService.list(Wrappers.lambdaQuery(PerformanceAppraisalApplication.class) .eq(PerformanceAppraisalApplication::getAppraisalId, id)); performanceAppraisalApplicationService.removeBatchByIds(paas); + // 删除评级计划关联的分组信息 + groupService.remove(Wrappers.lambdaQuery(PerformanceAppraisalProjectGroup.class) + .eq(PerformanceAppraisalProjectGroup::getAppraisalId,id)); return "删除成功"; } return "删除失败"; @@ -502,7 +505,11 @@ public class PerformanceAppraisalPlanManage { }); if(CollUtil.isNotEmpty(allEmployeeCodes)){ - List users = userInfoHelper.getUserFullInfoByEmployeeCodes(allEmployeeCodes); + List users = Lists.newArrayList(); + for (String employeeCode : allEmployeeCodes) { + UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfoByEmployeeCode(employeeCode); + users.add(userFullInfo); + } if(CollUtil.isNotEmpty(users)){ userMap = users.stream().collect(Collectors.toMap(UserFullInfoDTO::getEmployeeCode,u -> u)); }