diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java index df550b7..733cdd2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java @@ -334,6 +334,8 @@ public class ConstructionManage { item.setDeliveryTime(w.getDeliveryTime()); item.setContractAmount(w.getContractAmount()); item.setAnnualPlanAmount(w.getAnnualPlanAmount()); + item.setTransactionTime(w.getTransactionTime()); + item.setTransactionAmount(w.getTransactionAmount()); return item; }); return PageVo.of(records, total); @@ -366,6 +368,10 @@ public class ConstructionManage { exportDTO.setDeliveryTime(r.getDeliveryTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); exportDTO.setContractAmount(r.getContractAmount()); exportDTO.setAnnualPlanAmount(r.getAnnualPlanAmount()); + if(Objects.nonNull(r.getTransactionTime())){ + exportDTO.setTransactionTime(r.getTransactionTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + } + exportDTO.setTransactionAmount(r.getTransactionAmount()); return exportDTO; }).collect(Collectors.toList()); }