From d7d6bc7ce065618dbeb7fb2ca18a2be703f42a52 Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Fri, 8 Nov 2024 11:44:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(report):=20=E4=B8=BA=20TOB=20=E5=92=8C=20T?=
 =?UTF-8?q?OC=20=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E6=98=8E=E7=BB=86=20D?=
 =?UTF-8?q?TO=20=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 TobofsSaleoutDetailedDto 和 TocofsSaleoutDetailedDto 中添加 businessDate 和 successfulTradeDate 字段- 在 TocofsSaleoutDetailedEntity.xml 中添加对应的数据库映射
- 新增字段用于表示库存出库完成时间和交易成功时间
---
 .../frame/report/lets/dto/TobofsSaleoutDetailedDto.java   | 8 +++++++-
 .../frame/report/lets/dto/TocofsSaleoutDetailedDto.java   | 6 ++++++
 .../report/lets/entity/TocofsSaleoutDetailedEntity.xml    | 4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java
index d6810603..ac3695ef 100644
--- a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java
+++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java
@@ -47,6 +47,9 @@ public class TobofsSaleoutDetailedDto {
     private String businesstype;
 
     //库存 开始
+    @ExcelProperty(value = "库存-O出库完成时间")
+    private String businessDate;
+
     @ExcelProperty(value = "库存-推送状态")
     private String newstate;
 
@@ -62,8 +65,11 @@ public class TobofsSaleoutDetailedDto {
     @ExcelProperty(value = "库存-U8C主键")
     private String newsystemprimary;
     //库存 结束
-    
+
     //TOB交易红 开始
+    @ExcelProperty(value = "交易-O交易成功时间")
+    private String successfulTradeDate;
+
     @ExcelProperty(value = "交易-推送状态")
     private String newstate4;
 
diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java
index 280c463d..80e6812b 100644
--- a/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java
+++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java
@@ -47,6 +47,9 @@ public class TocofsSaleoutDetailedDto {
     private String businesstype;
 
     //库存 开始
+    @ExcelProperty(value = "库存-O出库完成时间")
+    private String businessDate;
+
     @ExcelProperty(value = "库存-推送状态")
     private String newstate;
 
@@ -64,6 +67,9 @@ public class TocofsSaleoutDetailedDto {
     //库存 结束
 
     //交易红 开始
+    @ExcelProperty(value = "交易-O交易成功时间")
+    private String successfulTradeDate;
+
     @ExcelProperty(value = "交易红-推送状态")
     private String newstate2;
 
diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml
index 10fe75ff..0a9db093 100644
--- a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml
+++ b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml
@@ -438,6 +438,8 @@
         <result property="def4" column="def4" jdbcType="VARCHAR"/>
         <result property="newsystemnumber3" column="newSystemNumber3" jdbcType="VARCHAR"/>
         <result property="newsystemprimary3" column="newSystemPrimary3" jdbcType="VARCHAR"/>
+        <result property="businessDate" column="businessDate" jdbcType="VARCHAR"/>
+        <result property="successfulTradeDate" column="successfulTradeDate" jdbcType="VARCHAR"/>
     </resultMap>
 
 
@@ -462,6 +464,8 @@
         <result property="def6" column="def6" jdbcType="VARCHAR"/>
         <result property="newsystemnumber4" column="newSystemNumber4" jdbcType="VARCHAR"/>
         <result property="newsystemprimary4" column="newSystemPrimary4" jdbcType="VARCHAR"/>
+        <result property="businessDate" column="businessDate" jdbcType="VARCHAR"/>
+        <result property="successfulTradeDate" column="successfulTradeDate" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!-- TOC通用查询 采用==查询 -->