|
|
@@ -677,12 +677,12 @@ public class ProjectLibManage { |
|
|
|
/** |
|
|
|
* 获取政务信息系统改造情况 |
|
|
|
* |
|
|
|
* @param projectId \ |
|
|
|
* @param projectCode \ |
|
|
|
* @return \ |
|
|
|
*/ |
|
|
|
private List<GovSystemReplaceInfoDTO> getGovSystemReplaceInfos(Long projectId, String upgradeContent) { |
|
|
|
private List<GovSystemReplaceInfoDTO> getGovSystemReplaceInfos(String projectCode, String upgradeContent) { |
|
|
|
Wrapper<ProjectGovSystemReplaceInfos> query = Wrappers.lambdaQuery(ProjectGovSystemReplaceInfos.class) |
|
|
|
.eq(ProjectGovSystemReplaceInfos::getProjectId, projectId) |
|
|
|
.eq(ProjectGovSystemReplaceInfos::getProjectCode, projectCode) |
|
|
|
.orderByAsc(ProjectGovSystemReplaceInfos::getId) |
|
|
|
.orderByAsc(ProjectGovSystemReplaceInfos::getBatchNo); |
|
|
|
List<ProjectGovSystemReplaceInfos> govSystemReplaceInfos = systemReplaceInfosService.list(query); |
|
|
@@ -747,7 +747,7 @@ public class ProjectLibManage { |
|
|
|
Map<Long, List<ProjectCoreBusinessIndicators>> coreBizMap = CollUtils.group(coreBizs, ProjectCoreBusinessIndicators::getApplicationId); |
|
|
|
retProjectDetail.setProjectApplications(CollUtils.convert(applications, app -> ProjectManageUtil.to(app, coreBizMap))); |
|
|
|
} |
|
|
|
retProjectDetail.setSystemReplaceInfos(getGovSystemReplaceInfos(project.getId(), project.getIterativeUpgradeContent())); |
|
|
|
retProjectDetail.setSystemReplaceInfos(getGovSystemReplaceInfos(project.getProjectCode(), project.getIterativeUpgradeContent())); |
|
|
|
//审批信息 |
|
|
|
if (StrUtils.isNotBlank(project.getInstCode())) { |
|
|
|
ProcessDetailReq req = new ProcessDetailReq(); |
|
|
|