From dc7f10a1ce1e419eac0014b744fb7122e7209129 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 15 Jun 2024 19:09:09 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisSiteSettleRecord.java |  8 ++++---
 .../mapper/EmisSiteSettleRecordMapper.xml     | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
index 25563956d..79f669d2b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisSiteSettleRecord.java
  * @author linfso
- * @date 2024-06-15 07:21:29
+ * @date 2024-06-15 11:07:03
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> 网点账户结算记录 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisSiteSettleRecord
  * @Description 网点账户结算记录
  * @author linfso
- * @date 2024-06-15 07:21:29
+ * @date 2024-06-15 11:07:03
  */
 @Data
 public class EmisSiteSettleRecord extends BaseEntity
@@ -39,10 +39,12 @@ public class EmisSiteSettleRecord extends BaseEntity
     private String accCode;
     /* 运单号 */
     private String billCode;
-    /* 收支类型：应收 应付 */
+    /* 结算类型：应收 应付 */
     private String recPayType;
     /* 结算类型: 充值等 */
     private String settleType;
+    /* 结算类型名称 */
+    private String settleName;
     /* 前余额 */
     private BigDecimal preBalance;
     /* 前确认余额 */
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
index 737bfbaec..95f1b693d 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml
@@ -4,12 +4,13 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisSiteSettleRecordMapper">
 
-    <resultMap type="EmisSiteSettleRecord" id="EmisSiteSettleRecordResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
+    <resultMap type="EmisSiteSettleRecord" id="EmisSiteSettleRecordResult">
         <result property="id"    column="id"    />
         <result property="accCode"    column="acc_code"    />
         <result property="billCode"    column="bill_code"    />
         <result property="recPayType"    column="rec_pay_type"    />
         <result property="settleType"    column="settle_type"    />
+        <result property="settleName"    column="settle_name"    />
         <result property="preBalance"    column="pre_balance"    />
         <result property="preConfirmBalance"    column="pre_confirm_balance"    />
         <result property="curMoney"    column="cur_money"    />
@@ -43,7 +44,7 @@
     </resultMap>
 
     <sql id="selectEmisSiteSettleRecordVo">
-        select id, acc_code, bill_code, rec_pay_type, settle_type, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_code, site_code, source_type, finance_date, operata_date, bl_confirm, confirm_man_code, confirm_site_code, settle_man_code, settle_site_code, bl_center, center_man_code, bl_site, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, center_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site_settle_record
+        select id, acc_code, bill_code, rec_pay_type, settle_type, settle_name, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_code, site_code, source_type, finance_date, operata_date, bl_confirm, confirm_man_code, confirm_site_code, settle_man_code, settle_site_code, bl_center, center_man_code, bl_site, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, center_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site_settle_record
     </sql>
 
     <select id="selectEmisSiteSettleRecordList" parameterType="EmisSiteSettleRecord" resultMap="EmisSiteSettleRecordResult">
@@ -53,19 +54,20 @@
             <if test="id != null "> and id = #{id}</if>
             <if test="accCode != null  and accCode != ''"> and acc_code like concat('%', #{accCode}, '%')</if>
             <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
-            <if test="recPayType != null  and recPayType != ''"> and rec_pay_type like concat('%', #{recPayType}, '%')</if>
-            <if test="settleType != null  and settleType != ''"> and settle_type like concat('%', #{settleType}, '%')</if>
+            <if test="recPayType != null  and recPayType != ''"> and rec_pay_type=#{recPayType}</if>
+            <if test="settleType != null  and settleType != ''"> and settle_type=#{settleType}</if>
+            <if test="settleName != null  and settleName != ''"> and settle_name like concat('%', #{settleName}, '%')</if>
             <if test="preBalance != null "> and pre_balance = #{preBalance}</if>
             <if test="preConfirmBalance != null "> and pre_confirm_balance = #{preConfirmBalance}</if>
             <if test="curMoney != null "> and cur_money = #{curMoney}</if>
             <if test="curConfirmMoney != null "> and cur_confirm_money = #{curConfirmMoney}</if>
             <if test="backBalance != null "> and back_balance = #{backBalance}</if>
             <if test="backConfirmBalance != null "> and back_confirm_balance = #{backConfirmBalance}</if>
-            <if test="currency != null  and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
-            <if test="changeType != null  and changeType != ''"> and change_type like concat('%', #{changeType}, '%')</if>
+            <if test="currency != null  and currency != ''"> and currency = #{currency}</if>
+            <if test="changeType != null  and changeType != ''"> and change_type = #{changeType}</if>
             <if test="changeDate != null "> and change_date = #{changeDate}</if>
-            <if test="centerCode != null  and centerCode != ''"> and center_code like concat('%', #{centerCode}, '%')</if>
-            <if test="siteCode != null  and siteCode != ''"> and site_code like concat('%', #{siteCode}, '%')</if>
+            <if test="centerCode != null  and centerCode != ''"> and center_code = #{centerCode}</if>
+            <if test="siteCode != null  and siteCode != ''"> and site_code = #{siteCode}</if>
             <if test="sourceType != null  and sourceType != ''"> and source_type like concat('%', #{sourceType}, '%')</if>
             <if test="financeDate != null "> and finance_date = #{financeDate}</if>
             <if test="operataDate != null "> and operata_date = #{operataDate}</if>
@@ -105,6 +107,7 @@
            and bill_code = #{billCode}
            and rec_pay_type = #{recPayType}
            and settle_type = #{settleType}
+           and settle_name = #{settleName}
            and pre_balance = #{preBalance}
            and pre_confirm_balance = #{preConfirmBalance}
            and cur_money = #{curMoney}
@@ -147,7 +150,7 @@
 	</select>
 
     <select id="selectEmisSiteSettleRecordById" parameterType="Long" resultMap="EmisSiteSettleRecordResult">
-        select id, acc_code, bill_code, rec_pay_type, settle_type, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_code, site_code, source_type, finance_date, operata_date, bl_confirm, confirm_man_code, confirm_site_code, settle_man_code, settle_site_code, bl_center, center_man_code, bl_site, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, center_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, acc_code, bill_code, rec_pay_type, settle_type, settle_name, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_code, site_code, source_type, finance_date, operata_date, bl_confirm, confirm_man_code, confirm_site_code, settle_man_code, settle_site_code, bl_center, center_man_code, bl_site, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, center_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_site_settle_record a
         where a.id = #{id}
     </select>
@@ -160,6 +163,7 @@
             <if test="billCode != null and billCode != ''">bill_code,</if>
             <if test="recPayType != null and recPayType != ''">rec_pay_type,</if>
             <if test="settleType != null and settleType != ''">settle_type,</if>
+            <if test="settleName != null and settleName != ''">settle_name,</if>
             <if test="preBalance != null">pre_balance,</if>
             <if test="preConfirmBalance != null">pre_confirm_balance,</if>
             <if test="curMoney != null">cur_money,</if>
@@ -205,6 +209,7 @@
             <if test="billCode != null and billCode != ''">#{billCode},</if>
             <if test="recPayType != null and recPayType != ''">#{recPayType},</if>
             <if test="settleType != null and settleType != ''">#{settleType},</if>
+            <if test="settleName != null and settleName != ''">#{settleName},</if>
             <if test="preBalance != null">#{preBalance},</if>
             <if test="preConfirmBalance != null">#{preConfirmBalance},</if>
             <if test="curMoney != null">#{curMoney},</if>
@@ -253,6 +258,7 @@
             <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
             <if test="recPayType != null and recPayType != ''">rec_pay_type = #{recPayType},</if>
             <if test="settleType != null and settleType != ''">settle_type = #{settleType},</if>
+            <if test="settleName != null and settleName != ''">settle_name = #{settleName},</if>
             <if test="preBalance != null">pre_balance = #{preBalance},</if>
             <if test="preConfirmBalance != null">pre_confirm_balance = #{preConfirmBalance},</if>
             <if test="curMoney != null">cur_money = #{curMoney},</if>