diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java index 06ecefe..2f41f51 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java @@ -59,8 +59,8 @@ public class PerformanceAppraisalConveter { vo.setAppId(a.getApplicationId()); if(map.containsKey(a.getApplicationId())){ ProjectApplication application = map.get(a.getApplicationId()); - vo.setApplicationName(StringUtils.isNotBlank(application.getApplicationName())? - application.getApplicationName() : application.getRelatedExistsApplication()); + vo.setApplicationName(StringUtils.isNotBlank(application.getRelatedExistsApplication())? + application.getRelatedExistsApplication() : application.getApplicationName()); vo.setApplicationType(application.getApplicationType()); vo.setBizDomain(application.getBizDomain()); vo.setBuildOrgName(application.getBuildOrgName()); 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 3d54932..cc1b93d 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 @@ -92,9 +92,8 @@ public class PerformanceAppraisalPlanManage { * @return */ public PageVo list(PerformanceAppraisalListReq req) { - UserInfoDetails userDetail = LoginUserUtil.loginUserDetail(); - String regionCode = userDetail.getRegionCode(); Page page = req.page(); + String regionCode = req.getRegionCode(); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(PerformanceAppraisal.class) .like(StringUtils.isNotBlank(req.getPlanName()),PerformanceAppraisal::getName,req.getPlanName()) .ge(Objects.nonNull(req.getStart()),PerformanceAppraisal::getCreateOn,req.getStart()) @@ -909,7 +908,7 @@ public class PerformanceAppraisalPlanManage { vo.setAppId(r.getId()); vo.setAppraisalProjectId(r.getProjectId()); vo.setAppraisalProjectCode(r.getProjectCode()); - vo.setApplicationName(Objects.nonNull(r.getApplicationName()) ? r.getApplicationName() : r.getRelatedExistsApplication()); + vo.setApplicationName(Objects.nonNull(r.getRelatedExistsApplication()) ? r.getRelatedExistsApplication() : r.getApplicationName()); vo.setBuildOrgName(r.getBuildOrgName()); vo.setApplicationType(r.getApplicationType()); vo.setBizDomain(r.getBizDomain()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java index fbc2ac2..6900e8f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java @@ -490,4 +490,14 @@ public class ReAppraisalManage { throw new BizException(e.getMessage()); } } + + public static void main(String[] args) { + Integer lastCount = 2; + List accidents = Lists.newArrayList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); + List accidentList = accidents.stream() + .skip(lastCount) + .limit(accidents.size() - lastCount) + .collect(Collectors.toList()); + System.out.println(accidentList); + } }