From 3a3609283e15dd7a81ea84e3c12506d4881eb780 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 13 Oct 2024 09:42:23 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisTmsCostFee.java     |  3 +++
 .../src/main/resources/mapper/EmisTmsCostFeeMapper.xml | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
index 01a76e6da..d4a7a00b7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
@@ -55,6 +55,9 @@ public class EmisTmsCostFee extends BaseEntity
     private String destPlace;
     /* 成本费 */
     private BigDecimal costFee;
+    /* 交易时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date tradeDate;
     /* 总票数 */
     private Integer sendPieceSum;
     /* 总件数 */
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
index ec43ab9e3..8e2202933 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
@@ -15,6 +15,7 @@
         <result property="sendPlace"    column="send_place"    />
         <result property="destPlace"    column="dest_place"    />
         <result property="costFee"    column="cost_fee"    />
+        <result property="tradeDate"    column="trade_date"    />
         <result property="sendPieceSum"    column="send_piece_sum"    />
         <result property="pieceNumber"    column="piece_number"    />
         <result property="totalWeight"    column="total_weight"    />
@@ -35,7 +36,7 @@
     </resultMap>
 
     <sql id="selectEmisTmsCostFeeVo">
-        select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, send_place, dest_place, cost_fee, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee
+        select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee
     </sql>
 
     <select id="selectEmisTmsCostFeeList" parameterType="EmisTmsCostFee" resultMap="EmisTmsCostFeeResult">
@@ -52,6 +53,7 @@
             <if test="sendPlace != null  and sendPlace != ''"> and send_place like concat('%', #{sendPlace}, '%')</if>
             <if test="destPlace != null  and destPlace != ''"> and dest_place like concat('%', #{destPlace}, '%')</if>
             <if test="costFee != null "> and cost_fee = #{costFee}</if>
+            <if test="tradeDate != null "> and trade_date = #{tradeDate}</if>
             <if test="sendPieceSum != null "> and send_piece_sum = #{sendPieceSum}</if>
             <if test="pieceNumber != null "> and piece_number = #{pieceNumber}</if>
             <if test="totalWeight != null "> and total_weight = #{totalWeight}</if>
@@ -94,6 +96,7 @@
            and send_place = #{sendPlace}
            and dest_place = #{destPlace}
            and cost_fee = #{costFee}
+           and trade_date = #{tradeDate}
            and send_piece_sum = #{sendPieceSum}
            and piece_number = #{pieceNumber}
            and total_weight = #{totalWeight}
@@ -123,7 +126,7 @@
 	</select>
 
     <select id="selectEmisTmsCostFeeById" parameterType="Long" resultMap="EmisTmsCostFeeResult">
-        select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, send_place, dest_place, cost_fee, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_cost_fee a
         where a.id = #{id}
     </select>
@@ -141,6 +144,7 @@
             <if test="sendPlace != null and sendPlace != ''">send_place,</if>
             <if test="destPlace != null and destPlace != ''">dest_place,</if>
             <if test="costFee != null">cost_fee,</if>
+            <if test="tradeDate != null">trade_date,</if>
             <if test="sendPieceSum != null">send_piece_sum,</if>
             <if test="pieceNumber != null">piece_number,</if>
             <if test="totalWeight != null">total_weight,</if>
@@ -178,6 +182,7 @@
             <if test="sendPlace != null and sendPlace != ''">#{sendPlace},</if>
             <if test="destPlace != null and destPlace != ''">#{destPlace},</if>
             <if test="costFee != null">#{costFee},</if>
+            <if test="tradeDate != null">#{tradeDate},</if>
             <if test="sendPieceSum != null">#{sendPieceSum},</if>
             <if test="pieceNumber != null">#{pieceNumber},</if>
             <if test="totalWeight != null">#{totalWeight},</if>
@@ -218,6 +223,7 @@
             <if test="sendPlace != null and sendPlace != ''">send_place = #{sendPlace},</if>
             <if test="destPlace != null and destPlace != ''">dest_place = #{destPlace},</if>
             <if test="costFee != null">cost_fee = #{costFee},</if>
+            <if test="tradeDate != null">trade_date = #{tradeDate},</if>
             <if test="sendPieceSum != null">send_piece_sum = #{sendPieceSum},</if>
             <if test="pieceNumber != null">piece_number = #{pieceNumber},</if>
             <if test="totalWeight != null">total_weight = #{totalWeight},</if>