|
|
@@ -226,7 +226,7 @@ public class OpenApiProjectLibManage { |
|
|
|
.collect(Collectors.groupingBy(ProjectGovSystemReplaceInfos::getBidId, |
|
|
|
Collectors.mapping(ProjectGovSystemReplaceInfos::getSourceSystemId, Collectors.toList()))); |
|
|
|
// 合同信息 |
|
|
|
Map<Long,Contract> contractMap = contractService.listByBidIds(bidIds); |
|
|
|
Map<Long, Contract> contractMap = contractService.listByBidIds(bidIds); |
|
|
|
// 实施信息 |
|
|
|
List<Operation> operations = operationService.listByBidIds(bidIds); |
|
|
|
Map<Long, Operation> 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; |
|
|
|
} |
|
|
|