Procházet zdrojové kódy

fix:

1. 项目详情查询关联系统修改;
master
WendyYang před 5 měsíci
rodič
revize
8bb3f9e049
2 změnil soubory, kde provedl 5 přidání a 5 odebrání
  1. +4
    -4
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java
  2. +1
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java

+ 4
- 4
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java Zobrazit soubor

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


+ 1
- 1
hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java Zobrazit soubor

@@ -393,7 +393,7 @@ public class WorkbenchManage {
List<ProjectStatusChange> projectStatusChanges = projectStatusChangeService.list(pscQuery); List<ProjectStatusChange> projectStatusChanges = projectStatusChangeService.list(pscQuery);
projectStatusChangeMap.putAll(CollUtils.group(projectStatusChanges, ProjectStatusChange::getProjectCode)); projectStatusChangeMap.putAll(CollUtils.group(projectStatusChanges, ProjectStatusChange::getProjectCode));
currStat.setStoppedCount(stoppedProjectCount(projectStatusChangeMap, allProjectCodes)); currStat.setStoppedCount(stoppedProjectCount(projectStatusChangeMap, allProjectCodes));
Pair<Integer, Integer> replaceSystemCount = countReplaceSystemByProjectIds(allProjectIds);
Pair<Integer, Integer> replaceSystemCount = countReplaceSystemByProjectCodes(allProjectCodes);
currStat.setSourceCount(replaceSystemCount.getKey()); currStat.setSourceCount(replaceSystemCount.getKey());
currStat.setTargetCount(replaceSystemCount.getValue()); currStat.setTargetCount(replaceSystemCount.getValue());
} }


Načítá se…
Zrušit
Uložit