From 695c799eb621e5249ad7bf6f0f79dfaa8e5057aa Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Thu, 16 Jan 2025 14:19:03 +0800
Subject: [PATCH] =?UTF-8?q?refactor(report):=20=E9=87=8D=E6=9E=84=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 TobofsSaleoutDetailedDto 和 TocofsSaleoutDetailedDto 中的属性名称
- 更新 TocofsSaleoutDetailedEntity.xml 中的结果映射
- 删除不必要的注释代码
---
 .../hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java  | 1 +
 .../hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java  | 3 ++-
 .../frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml  | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

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 c6b35733..241c8cbd 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
@@ -69,6 +69,7 @@ public class TobofsSaleoutDetailedDto {
     //TOB交易红 开始
 //    @ExcelProperty(value = "交易-O交易成功时间")
 //    private String successfulTradeDate;
+
     @ExcelProperty(value = "交易-O交易成功时间")
     private String tradeSuccessAt;
 
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 b34a107b..70ff92e0 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
@@ -67,8 +67,9 @@ public class TocofsSaleoutDetailedDto {
     //库存 结束
 
     //交易红 开始
-//    @ExcelProperty(value = "交易-O交易成功时间")
+//    @ExcelProperty(value = "交易-更新时间")
 //    private String successfulTradeDate;
+
     @ExcelProperty(value = "交易-O交易成功时间")
     private String tradeSuccessAt;
 
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 a95af29f..d4664145 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
@@ -439,7 +439,7 @@
         <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"/>
+<!--        <result property="successfulTradeDate" column="successfulTradeDate" jdbcType="VARCHAR"/>-->
         <result property="tradeSuccessAt" column="tradeSuccessAt" jdbcType="VARCHAR"/>
 
         <result property="def7" column="def7" jdbcType="VARCHAR"/>
@@ -473,7 +473,7 @@
         <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"/>
+<!--        <result property="successfulTradeDate" column="successfulTradeDate" jdbcType="VARCHAR"/>-->
         <result property="tradeSuccessAt" column="tradeSuccessAt" jdbcType="VARCHAR"/>
 
         <result property="def7" column="def7" jdbcType="VARCHAR"/>