|
|
@@ -1083,7 +1083,6 @@ public class PerformanceAppraisalPlanManage { |
|
|
|
String regionCode = user.getRegionCode(); |
|
|
|
Long appraisalId = req.getAppraisalId(); |
|
|
|
|
|
|
|
Page<ProjectApplication> page = req.page(); |
|
|
|
LambdaQueryWrapper<ProjectApplication> 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<ProjectApplication> relatedAppList = Lists.newArrayList(); |
|
|
|
//// TODO 对IRS关联应用是否按照应用名称和应用code进行去重(在不同项目中,已经在IRS注册过的同一个应用只显示一个)? |
|
|
|
//List<ProjectApplication> relatedList = resList.stream().filter(r -> StringUtils.isNotBlank(r.getRelatedExistsApplication())).collect(Collectors.toList()); |
|
|
|
//if (CollUtil.isNotEmpty(relatedList)) { |
|
|
|
// resList.removeAll(relatedList); |
|
|
|
// Map<String, List<ProjectApplication>> relatedAppMap = relatedList.stream() |
|
|
|
// .collect(Collectors.groupingBy(r -> r.getRelatedExistsApplication() + r.getRelatedExistsApplicationCode())); |
|
|
|
// for (Map.Entry<String, List<ProjectApplication>> entry : relatedAppMap.entrySet()) { |
|
|
|
// List<ProjectApplication> value = entry.getValue(); |
|
|
|
// relatedAppList.add(value.get(0)); |
|
|
|
// } |
|
|
|
// resList.addAll(relatedAppList); |
|
|
|
//} |
|
|
|
//// TODO 对初次建设应用,是否根据建设方案申报时填写的应用名称、应用类型、发布端、应用简介、等保级别、密评级别 去重? |
|
|
|
Integer pageNumber = req.getPageNumber(); |
|
|
|
Integer pageSize = req.getPageSize(); |
|
|
|
List<ProjectApplication> resultList = resList.stream() |
|
|
|