From ed8c6b0f48f8277df6290c8c9805187c77b56b77 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 12 Dec 2024 18:09:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=20=E6=A0=87=E9=A1=B9=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=BC=80=E6=94=BE=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8B=9B=E6=A0=87=E6=96=87=E4=BB=B6=E3=80=81=E5=88=9D=E9=AA=8C?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java index c47398d..13709c5 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java @@ -226,7 +226,7 @@ public class OpenApiProjectLibManage { .collect(Collectors.groupingBy(ProjectGovSystemReplaceInfos::getBidId, Collectors.mapping(ProjectGovSystemReplaceInfos::getSourceSystemId, Collectors.toList()))); // 合同信息 - Map contractMap = contractService.listByBidIds(bidIds); + Map contractMap = contractService.listByBidIds(bidIds); // 实施信息 List operations = operationService.listByBidIds(bidIds); Map operationMap = CollUtils.listToMap(operations, Operation::getBidId); @@ -261,9 +261,10 @@ public class OpenApiProjectLibManage { BizUtils.notNull(w.getFinalInspectionDate(), ft -> tender.setFinalTime(ft.atStartOfDay())); BizUtils.notNull(w.getPreliminaryInspectionDate(), ft -> tender.setInitialTime(ft.atStartOfDay())); + tender.setTenderFiles(collectFileStrIds(w.getBidDoc(), fileIds, fileIdMap)); + tender.setInitialReportFiles(collectFileStrIds(w.getPreliminaryInspectionMaterials(), fileIds, fileIdMap)); tender.setFinalReportFiles(collectFileStrIds(w.getFinalInspectionMaterials(), fileIds, fileIdMap)); tender.setBidNotifyFiles(collectFileStrIds(w.getAcceptanceLetter(), fileIds, fileIdMap)); - tender.setBuyPlanFiles(collectFileStrIds(w.getBidDoc(), fileIds, fileIdMap)); Contract contract = contractMap.get(w.getId()); if (contract != null) { @@ -286,8 +287,9 @@ public class OpenApiProjectLibManage { w.setLpReportFiles(convertToFileStrId(w.getLpReportFiles(), fileIdMap)); w.setFinalReportFiles(convertToFileStrId(w.getFinalReportFiles(), fileIdMap)); w.setBidNotifyFiles(convertToFileStrId(w.getBidNotifyFiles(), fileIdMap)); - w.setBuyPlanFiles(convertToFileStrId(w.getBuyPlanFiles(), fileIdMap)); + w.setTenderFiles(convertToFileStrId(w.getTenderFiles(), fileIdMap)); w.setBuyConFiles(convertToFileStrId(w.getBuyConFiles(), fileIdMap)); + w.setInitialReportFiles(convertToFileStrId(w.getInitialReportFiles(), fileIdMap)); } return collect; }