Browse Source

绩效评价-评价计划修改

tags/24080901
CMM 1 year ago
parent
commit
0f0525c4d0
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java
  2. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java

+ 1
- 1
pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java View File

@@ -60,7 +60,7 @@ public class PerformanceAppraisalConveter {
if(map.containsKey(a.getApplicationId())){
ProjectApplication application = map.get(a.getApplicationId());
vo.setApplicationName(StringUtils.isNotBlank(application.getApplicationName())?
application.getApplicationName() : application.getAccountAppName());
application.getApplicationName() : application.getRelatedExistsApplication());
vo.setApplicationType(application.getApplicationType());
vo.setBizDomain(application.getBizDomain());
vo.setBuildOrgName(application.getBuildOrgName());


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

@@ -432,7 +432,7 @@ public class PerformanceAppraisalPlanManage {

Map<Long, ProjectApplication> applicationMap = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class).in(ProjectApplication::getId, applicationIds)).stream()
.collect(Collectors.toMap(ProjectApplication::getId, a -> a));
for(Long applicationId : applicationIds){
for(Long applicationId : applicationIdList){
PerformanceAppraisalApplication paa = new PerformanceAppraisalApplication();
paa.setAppraisalId(id);
paa.setApplicationId(applicationId);


Loading…
Cancel
Save