Pārlūkot izejas kodu

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

master
CMM pirms 1 gada
vecāks
revīzija
5121f154e8
1 mainītis faili ar 12 papildinājumiem un 0 dzēšanām
  1. +12
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java

+ 12
- 0
pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java Parādīt failu

@@ -293,6 +293,18 @@ public class PerformanceAppraisalPlanManage {
pa.setUpdateBy(user.getUsername());
performanceAppraisalService.updateById(pa);
String target = editDTO.getTarget();
// 如果新编辑的评价计划不包含项目,删除原计划添加的评价项目信息
if (StringUtils.isNotBlank(target) && !target.contains(EvalObjectEnum.PROJECT.getCode())){
performanceAppraisalProjectService.remove(Wrappers.lambdaQuery(PerformanceAppraisalProject.class)
.eq(PerformanceAppraisalProject::getAppraisalId,editDTO.getId()));
}

// 如果新编辑的评价计划不包含应用,删除原计划添加的评价应用信息
if (StringUtils.isNotBlank(target) && !target.contains(EvalObjectEnum.APP.getCode())){
performanceAppraisalApplicationService.remove(Wrappers.lambdaQuery(PerformanceAppraisalApplication.class)
.eq(PerformanceAppraisalApplication::getAppraisalId,editDTO.getId()));
}

if(StringUtils.isNotBlank(target) &&
target.contains(EvalObjectEnum.PROJECT.getCode()) &&
CollUtil.isNotEmpty(editDTO.getProjects())){


Notiek ielāde…
Atcelt
Saglabāt