diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java index ddb1d02..5d1240e 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java @@ -677,12 +677,12 @@ public class ProjectLibManage { /** * 获取政务信息系统改造情况 * - * @param projectId \ + * @param projectCode \ * @return \ */ - private List getGovSystemReplaceInfos(Long projectId, String upgradeContent) { + private List getGovSystemReplaceInfos(String projectCode, String upgradeContent) { Wrapper query = Wrappers.lambdaQuery(ProjectGovSystemReplaceInfos.class) - .eq(ProjectGovSystemReplaceInfos::getProjectId, projectId) + .eq(ProjectGovSystemReplaceInfos::getProjectCode, projectCode) .orderByAsc(ProjectGovSystemReplaceInfos::getId) .orderByAsc(ProjectGovSystemReplaceInfos::getBatchNo); List govSystemReplaceInfos = systemReplaceInfosService.list(query); @@ -747,7 +747,7 @@ public class ProjectLibManage { Map> 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(); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java index 926ceda..ed7e7c7 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java @@ -393,7 +393,7 @@ public class WorkbenchManage { List projectStatusChanges = projectStatusChangeService.list(pscQuery); projectStatusChangeMap.putAll(CollUtils.group(projectStatusChanges, ProjectStatusChange::getProjectCode)); currStat.setStoppedCount(stoppedProjectCount(projectStatusChangeMap, allProjectCodes)); - Pair replaceSystemCount = countReplaceSystemByProjectIds(allProjectIds); + Pair replaceSystemCount = countReplaceSystemByProjectCodes(allProjectCodes); currStat.setSourceCount(replaceSystemCount.getKey()); currStat.setTargetCount(replaceSystemCount.getValue()); }