From ec094803e41c205aec40cc43459505b97143d061 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 8 Oct 2024 07:48:27 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisSettleBillMapper.xml    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 7cf7f404f..817b23ba8 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -129,6 +129,8 @@
                 <where>
                     a.del_flag='0'
                     <if test="salesmen != null and salesmen!='' "> and  a.salesmen = #{salesmen}</if>
+                    <if test="settleType != null  and settleType != ''"> and a.settle_type= #{settleType}</if>
+
                     <if test="billMonth != null and billMonth!='' "> and  a.bill_month = #{billMonth}</if>
                     <if test="openBillStatus != null  and openBillStatus != ''"> and a.open_bill_status = #{openBillStatus}</if>
                     <if test="paymentStatus != null  and paymentStatus != ''"> and  a.payment_status = #{paymentStatus}</if>
@@ -153,6 +155,8 @@
                 <where>
                     a.del_flag='0'
                     <if test="salesmen != null and salesmen!='' "> and  a.salesmen = #{salesmen}</if>
+                    <if test="settleType != null  and settleType != ''"> and a.settle_type= #{settleType}</if>
+
                     <if test="billMonth != null and billMonth!='' "> and  a.bill_month = #{billMonth}</if>
                     <if test="openBillStatus != null  and openBillStatus != ''"> and a.open_bill_status = #{openBillStatus}</if>
                     <if test="paymentStatus != null  and paymentStatus != ''"> and  a.payment_status = #{paymentStatus}</if>
@@ -197,6 +201,8 @@
                 <where>
                     a.del_flag='0' and b.del_flag='0' and a.settle_bill_no=b.settle_bill_no and b.create_time  <![CDATA[ > ]]> a.payment_due_date
                     <if test="salesmen != null and salesmen!='' "> and  a.salesmen = #{salesmen}</if>
+                    <if test="settleType != null  and settleType != ''"> and a.settle_type= #{settleType}</if>
+
                     <if test="billMonth != null and billMonth!='' "> and  a.bill_month = #{billMonth}</if>
                     <if test="openBillStatus != null  and openBillStatus != ''"> and a.open_bill_status = #{openBillStatus}</if>
                     <if test="paymentStatus != null  and paymentStatus != ''"> and  a.payment_status = #{paymentStatus}</if>
@@ -219,6 +225,8 @@
                 <where>
                     a.del_flag='0' and now()  <![CDATA[ > ]]> a.payment_due_date
                     <if test="salesmen != null and salesmen!='' "> and  a.salesmen = #{salesmen}</if>
+                    <if test="settleType != null  and settleType != ''"> and a.settle_type= #{settleType}</if>
+
                     <if test="billMonth != null and billMonth!='' "> and  a.bill_month = #{billMonth}</if>
                     <if test="openBillStatus != null  and openBillStatus != ''"> and a.open_bill_status = #{openBillStatus}</if>
                     <if test="paymentStatus != null  and paymentStatus != ''"> and  a.payment_status = #{paymentStatus}</if>
@@ -258,6 +266,8 @@
             <where>
                 a.del_flag='0'
                 <if test="salesmen != null and salesmen!='' "> and  a.salesmen = #{salesmen}</if>
+                <if test="settleType != null  and settleType != ''"> and a.settle_type= #{settleType}</if>
+
                 <if test="billMonth != null and billMonth!='' "> and  a.bill_month = #{billMonth}</if>
                 <if test="openBillStatus != null  and openBillStatus != ''"> and a.open_bill_status = #{openBillStatus}</if>
                 <if test="paymentStatus != null  and paymentStatus != ''"> and  a.payment_status = #{paymentStatus}</if>
@@ -283,6 +293,8 @@
             <where>
                 a.del_flag='0'
                 <if test="salesmen != null and salesmen!='' "> and  a.salesmen = #{salesmen}</if>
+                <if test="settleType != null  and settleType != ''"> and a.settle_type= #{settleType}</if>
+
                 <if test="billMonth != null and billMonth!='' "> and  a.bill_month = #{billMonth}</if>
                 <if test="openBillStatus != null  and openBillStatus != ''"> and a.open_bill_status = #{openBillStatus}</if>
                 <if test="paymentStatus != null  and paymentStatus != ''"> and  a.payment_status = #{paymentStatus}</if>
@@ -305,6 +317,8 @@
             <where>
                 a.del_flag='0' and b.del_flag='0' and FIND_IN_SET(a.settle_bill_no,b.settle_bill_no) and b.create_time  <![CDATA[ <= ]]> a.payment_due_date
                 <if test="salesmen != null and salesmen!='' "> and  a.salesmen = #{salesmen}</if>
+                <if test="settleType != null  and settleType != ''"> and a.settle_type= #{settleType}</if>
+
                 <if test="billMonth != null and billMonth!='' "> and  a.bill_month = #{billMonth}</if>
                 <if test="openBillStatus != null  and openBillStatus != ''"> and a.open_bill_status = #{openBillStatus}</if>
                 <if test="paymentStatus != null  and paymentStatus != ''"> and  a.payment_status = #{paymentStatus}</if>
@@ -327,6 +341,8 @@
             <where>
                 a.del_flag='0' and b.del_flag='0' and FIND_IN_SET(a.settle_bill_no,b.settle_bill_no) and b.create_time  <![CDATA[ > ]]> a.payment_due_date
                 <if test="salesmen != null and salesmen!='' "> and  a.salesmen = #{salesmen}</if>
+                <if test="settleType != null  and settleType != ''"> and a.settle_type= #{settleType}</if>
+
                 <if test="billMonth != null and billMonth!='' "> and  a.bill_month = #{billMonth}</if>
                 <if test="openBillStatus != null  and openBillStatus != ''"> and a.open_bill_status = #{openBillStatus}</if>
                 <if test="paymentStatus != null  and paymentStatus != ''"> and  a.payment_status = #{paymentStatus}</if>