From 8bb3f9e0494eccc4d59620ab4eddb86bad0fd4fd Mon Sep 17 00:00:00 2001 From: WendyYang Date: Wed, 13 Nov 2024 15:17:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=20=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java | 8 ++++---- .../main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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()); }