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 contracts = contractService.listByIds(bidIds); - Map contractMap = CollUtils.listToMap(contracts, Contract::getId); + Map contractMap = CollUtils.listToMap(contracts, Contract::getBidId); // 实施信息 List operations = operationService.listByBidIds(bidIds); - Map operationMap = CollUtils.listToMap(operations, Operation::getId); + Map operationMap = CollUtils.listToMap(operations, Operation::getBidId); List fileIds = new ArrayList<>(); Map 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;