From 3d437c745079bcd93d1585b67127447fa31f118f Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Wed, 11 Dec 2024 18:32:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201.=20=E5=A2=9E=E5=8A=A0=E6=A0=87?=
 =?UTF-8?q?=E9=A1=B9=E8=81=94=E7=B3=BB=E4=BA=BA=E4=B8=8E=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D=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    | 7 ++++---
 .../main/java/com/hz/pm/api/open/model/vo/TenderToMhDetailVO.java  | 6 ++++++
 2 files changed, 10 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 ce32176..ce6ea73 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
@@ -227,10 +227,10 @@ public class OpenApiProjectLibManage {
                         Collectors.mapping(ProjectGovSystemReplaceInfos::getSourceSystemId, Collectors.toList())));
         // 合同信息
         List<Contract> contracts = contractService.listByIds(bidIds);
-        Map<Long, Contract> contractMap = CollUtils.listToMap(contracts, Contract::getId);
+        Map<Long, Contract> contractMap = CollUtils.listToMap(contracts, Contract::getBidId);
         // 实施信息
         List<Operation> operations = operationService.listByBidIds(bidIds);
-        Map<Long, Operation> operationMap = CollUtils.listToMap(operations, Operation::getId);
+        Map<Long, Operation> operationMap = CollUtils.listToMap(operations, Operation::getBidId);
 
         List<Long> fileIds = new ArrayList<>();
         Map<Long, String> fileIdMap = new HashMap<>();
@@ -250,7 +250,8 @@ public class OpenApiProjectLibManage {
             tender.setXcReportFiles(collectFileStrIds(w.getXcfhxReportFiles(), fileIds, fileIdMap));
             tender.setLpReportFiles(collectFileStrIds(w.getSecurityEvalMaterials(), fileIds, fileIdMap));
             tender.setSystemIdList(bidIdSystemIdMap.get(w.getId()));
-
+            tender.setContact(w.getPurchasePhone());
+            tender.setContactPerson(w.getPurchaseContact());
             Operation operation = operationMap.get(w.getId());
             if (operation != null) {
                 tender.setRefactorTime(operation.getActualAdaptionTime());
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/TenderToMhDetailVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/TenderToMhDetailVO.java
index b43039d..fdf50f6 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/TenderToMhDetailVO.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/TenderToMhDetailVO.java
@@ -30,6 +30,12 @@ public class TenderToMhDetailVO {
     @ApiModelProperty(value = "标项名称")
     private String name;
 
+    @ApiModelProperty(value = "标项联系人")
+    private String contactPerson;
+
+    @ApiModelProperty(value = "标项联系人电话")
+    private String contact;
+
     @ApiModelProperty(value = "标项预算（万元）")
     private BigDecimal budgetPrice;