From 48bbd841791f9ee56bcb9c1d172df9b323cb7e91 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 21 Aug 2023 19:46:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=AF=84=E4=BB=B7-=E5=BE=85?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/PerformanceAppraisalPlanManage.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) 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 3b2c0e1..c4efade 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 @@ -1083,7 +1083,6 @@ public class PerformanceAppraisalPlanManage { String regionCode = user.getRegionCode(); Long appraisalId = req.getAppraisalId(); - Page page = req.page(); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(ProjectApplication.class) .like(StringUtils.isNotBlank(req.getBuildOrgName()), ProjectApplication::getBuildOrgName, req.getBuildOrgName()); @@ -1133,7 +1132,20 @@ public class PerformanceAppraisalPlanManage { if (CollUtil.isEmpty(resList)){ return PageVo.empty(); } - + //List relatedAppList = Lists.newArrayList(); + //// TODO 对IRS关联应用是否按照应用名称和应用code进行去重(在不同项目中,已经在IRS注册过的同一个应用只显示一个)？ + //List relatedList = resList.stream().filter(r -> StringUtils.isNotBlank(r.getRelatedExistsApplication())).collect(Collectors.toList()); + //if (CollUtil.isNotEmpty(relatedList)) { + // resList.removeAll(relatedList); + // Map> relatedAppMap = relatedList.stream() + // .collect(Collectors.groupingBy(r -> r.getRelatedExistsApplication() + r.getRelatedExistsApplicationCode())); + // for (Map.Entry> entry : relatedAppMap.entrySet()) { + // List value = entry.getValue(); + // relatedAppList.add(value.get(0)); + // } + // resList.addAll(relatedAppList); + //} + //// TODO 对初次建设应用,是否根据建设方案申报时填写的应用名称、应用类型、发布端、应用简介、等保级别、密评级别 去重？ Integer pageNumber = req.getPageNumber(); Integer pageSize = req.getPageSize(); List resultList = resList.stream()