|
@@ -1113,14 +1113,21 @@ public class PerformanceAppraisalPlanManage { |
|
|
.eq(Project::getAreaCode, regionCode) |
|
|
.eq(Project::getAreaCode, regionCode) |
|
|
.eq(Project::getNewest,Boolean.TRUE) |
|
|
.eq(Project::getNewest,Boolean.TRUE) |
|
|
.eq(Project::getStatus, ProjectStatusEnum.ACCEPTED.getCode())); |
|
|
.eq(Project::getStatus, ProjectStatusEnum.ACCEPTED.getCode())); |
|
|
|
|
|
if (CollUtil.isEmpty(projectList)){ |
|
|
|
|
|
return PageVo.empty(); |
|
|
|
|
|
} |
|
|
List<String> projectCodeList = projectList.stream().map(Project::getProjectCode).collect(Collectors.toList()); |
|
|
List<String> projectCodeList = projectList.stream().map(Project::getProjectCode).collect(Collectors.toList()); |
|
|
List<Integer> projectVersionList = projectList.stream().map(Project::getVersion).collect(Collectors.toList()); |
|
|
List<Integer> projectVersionList = projectList.stream().map(Project::getVersion).collect(Collectors.toList()); |
|
|
wrapper.in(ProjectApplication::getProjectCode,projectCodeList); |
|
|
wrapper.in(ProjectApplication::getProjectCode,projectCodeList); |
|
|
wrapper.in(ProjectApplication::getProjectVersion,projectVersionList); |
|
|
wrapper.in(ProjectApplication::getProjectVersion,projectVersionList); |
|
|
wrapper.orderByDesc(ProjectApplication::getUpdateOn); |
|
|
wrapper.orderByDesc(ProjectApplication::getUpdateOn); |
|
|
List<ProjectApplication> appList = projectApplicationService.list(wrapper); |
|
|
List<ProjectApplication> appList = projectApplicationService.list(wrapper); |
|
|
|
|
|
if (CollUtil.isEmpty(appList)){ |
|
|
|
|
|
return PageVo.empty(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
List<ProjectApplication> applicationList = Lists.newArrayList(); |
|
|
List<ProjectApplication> applicationList = Lists.newArrayList(); |
|
|
|
|
|
|
|
|
// 按项目编号+应用名称+IRS关联应用名称分组,获取最新版本的应用 |
|
|
// 按项目编号+应用名称+IRS关联应用名称分组,获取最新版本的应用 |
|
|
Map<String, List<ProjectApplication>> appMap = appList.stream().collect(Collectors.groupingBy(p -> p.getProjectCode() + p.getRelatedExistsApplication() + p.getApplicationName())); |
|
|
Map<String, List<ProjectApplication>> appMap = appList.stream().collect(Collectors.groupingBy(p -> p.getProjectCode() + p.getRelatedExistsApplication() + p.getApplicationName())); |
|
|
for (Map.Entry<String, List<ProjectApplication>> entry : appMap.entrySet()) { |
|
|
for (Map.Entry<String, List<ProjectApplication>> entry : appMap.entrySet()) { |
|
|