From c413f9684ca83b5163776da1ce814cea3bb48c52 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 11 Aug 2023 10:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E9=AA=8C=20=E6=88=90=E4=BA=A4?=
 =?UTF-8?q?=E5=93=A6=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java | 6 ++++++
 1 file changed, 6 insertions(+)

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());
         }