From 93f309eef98d54fc550eb810bb6f3685ca9bbb8e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 7 Jan 2025 14:16:59 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/domain/EmisTmsCostFee.java    |  2 ++
 .../resources/mapper/EmisTmsCostFeeMapper.xml     | 15 +++++++++++----
 2 files changed, 13 insertions(+), 4 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 1dacfab0a..2901fb951 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
@@ -64,6 +64,8 @@ public class EmisTmsCostFee extends BaseEntity
     private String destPlace;
     /* 成本费 */
     private BigDecimal costFee;
+    /* 账单月份 202402 */
+    private String billMonth;
     /* 交易时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date tradeDate;
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
index 97ee17191..628a5a642 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
@@ -18,6 +18,7 @@
         <result property="sendPlace"    column="send_place"    />
         <result property="destPlace"    column="dest_place"    />
         <result property="costFee"    column="cost_fee"    />
+        <result property="billMonth"    column="bill_month"    />
         <result property="tradeDate"    column="trade_date"    />
         <result property="sendPieceSum"    column="send_piece_sum"    />
         <result property="pieceNumber"    column="piece_number"    />
@@ -39,7 +40,7 @@
     </resultMap>
 
     <sql id="selectEmisTmsCostFeeVo">
-        select id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, 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
+        select id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, bill_month, 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">
@@ -49,8 +50,8 @@
             <if test="id != null "> and id = #{id}</if>
             <if test="costNo != null  and costNo != ''"> and cost_no = #{costNo}</if>
             <if test="costName != null  and costName != ''"> and cost_name like concat('%', #{costName}, '%')</if>
+            <if test="batchNo != null  and batchNo != ''"> and batch_no like concat('%', #{batchNo}, '%')</if>
             <if test="feeType != null  and feeType != ''"> and fee_type = #{feeType}</if>
-            <if test="batchNo != null  and batchNo != ''"> and batch_no=#{batchNo}</if>
             <if test="splitType != null  and splitType != ''"> and split_type = #{splitType}</if>
             <if test="transType != null  and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
             <if test="transSignNo != null  and transSignNo != ''"> and trans_sign_no like concat('%', #{transSignNo}, '%')</if>
@@ -59,6 +60,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="billMonth != null  and billMonth != ''"> and bill_month like concat('%', #{billMonth}, '%')</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>
@@ -95,6 +97,7 @@
            and id = #{id}
            and cost_no = #{costNo}
            and cost_name = #{costName}
+           and batch_no = #{batchNo}
            and fee_type = #{feeType}
            and split_type = #{splitType}
            and trans_type = #{transType}
@@ -104,6 +107,7 @@
            and send_place = #{sendPlace}
            and dest_place = #{destPlace}
            and cost_fee = #{costFee}
+           and bill_month = #{billMonth}
            and trade_date = #{tradeDate}
            and send_piece_sum = #{sendPieceSum}
            and piece_number = #{pieceNumber}
@@ -134,13 +138,13 @@
 	</select>
 
     <select id="selectEmisTmsCostFeeById" parameterType="Long" resultMap="EmisTmsCostFeeResult">
-        select id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, 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
+        select id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, bill_month, 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>
 
     <select id="selectEmisTmsCostFeeByCostNo" parameterType="String" resultMap="EmisTmsCostFeeResult">
-        select id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, 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
+        select id, cost_no, cost_name, batch_no, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, bill_month, 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.cost_no = #{costNo}
     </select>
@@ -160,6 +164,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="billMonth != null and billMonth != ''">bill_month,</if>
             <if test="tradeDate != null">trade_date,</if>
             <if test="sendPieceSum != null">send_piece_sum,</if>
             <if test="pieceNumber != null">piece_number,</if>
@@ -200,6 +205,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="billMonth != null and billMonth != ''">#{billMonth},</if>
             <if test="tradeDate != null">#{tradeDate},</if>
             <if test="sendPieceSum != null">#{sendPieceSum},</if>
             <if test="pieceNumber != null">#{pieceNumber},</if>
@@ -244,6 +250,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="billMonth != null and billMonth != ''">bill_month = #{billMonth},</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>