Merge branch 'ls2_performance_appraisal_0801' of http://git.ningdatech.com/liushuai/project-management into dev

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);

pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java

@@ -478,6 +478,9 @@ public class PerformanceAppraisalPlanManage {
             List<PerformanceAppraisalApplication> 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 "删除失败";
@@ -504,7 +507,11 @@ public class PerformanceAppraisalPlanManage {
         });
 
         if(CollUtil.isNotEmpty(allEmployeeCodes)){
-            List<UserFullInfoDTO> users = userInfoHelper.getUserFullInfoByEmployeeCodes(allEmployeeCodes);
+            List<UserFullInfoDTO> 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));
             }