From a011fcc767623abb1751d07edb602dd448a05517 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 14 Jul 2025 17:14:53 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E6=8F=90=E6=88=90=E7=AE=A1=E7=90=86=20-=20=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E6=8F=90=E6=88=90=E6=96=B9=E6=A1=88=E9=85=8D=E7=BD=AE=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E6=97=A5=E6=9C=9F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=20=20=20=20=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E6=8F=90=E6=88=90=E6=96=B9=E6=A1=88=E9=85=8D=E7=BD=AE=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E/=E4=BF=AE=E6=94=B9/=E6=89=B9=E9=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=A2=9E=E5=8A=A0=E9=AA=8C=E9=87=8D=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmisCommissionQuoteServiceImpl.java  |   9 ++
 .../mapper/EmisCommissionQuoteMapper.xml      | 111 ++++++++----------
 2 files changed, 56 insertions(+), 64 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionQuoteServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionQuoteServiceImpl.java
index 2b11a126a..83287df83 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionQuoteServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionQuoteServiceImpl.java
@@ -212,6 +212,15 @@ public class EmisCommissionQuoteServiceImpl implements IEmisCommissionQuoteServi
             if (emisCommissionQuote.getBlOpen() == null) {
                 emisCommissionQuote.setBlOpen(dbQuote.getBlOpen());
             }
+            if (emisCommissionQuote.getTransLineCode() == null) {
+                emisCommissionQuote.setTransLineCode(dbQuote.getTransLineCode());
+            }
+            if (emisCommissionQuote.getProdCode() == null) {
+                emisCommissionQuote.setProdCode(dbQuote.getProdCode());
+            }
+            if (emisCommissionQuote.getBlOpen() == null) {
+                emisCommissionQuote.setBlOpen(dbQuote.getBlOpen());
+            }
             if (emisCommissionQuote.getEmpCode() == null) {
                 emisCommissionQuote.setEmpCode(dbQuote.getEmpCode());
             }
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
index 437bd442c..23935e561 100644
--- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
@@ -261,73 +261,56 @@
         <where>
             del_flag='0'
             <if test="quoteId != null and quoteId != ''">
-            and quote_id != #{quoteId}
+                and quote_id != #{quoteId}
             </if>
             and (
-            (start_date <![CDATA[ <= ]]> #{startDate} and #{startDate} <![CDATA[ < ]]> end_date)
-            or
-            (start_date <![CDATA[ < ]]> #{endDate} and #{endDate} <![CDATA[ <= ]]> end_date)
-            or
-            (start_date <![CDATA[ >= ]]> #{startDate} and end_date <![CDATA[ <= ]]> #{endDate})
+            start_date &lt;= #{endDate} and end_date &gt;= #{startDate}
+            )
+            and (
+            emp_code = #{empCode}
+            or FIND_IN_SET(#{empCode}, emp_code)
+            or FIND_IN_SET(emp_code, #{empCode})
+            or emp_code='-1'
+            )
+            and (
+            emp_name = #{empName}
+            or FIND_IN_SET(#{empName}, emp_name)
+            or FIND_IN_SET(emp_name, #{empName})
+            or emp_name='全部'
+            )
+            and fee_type=#{feeType}
+            and bl_open=#{blOpen}
+            and calc_type=#{calcType}
+            and post_type=#{postType}
+            and (
+            trans_type = #{transType}
+            or FIND_IN_SET(#{transType}, trans_type)
+            or FIND_IN_SET(trans_type, #{transType})
+            )
+            and (
+            from_country = #{fromCountry}
+            or FIND_IN_SET(#{fromCountry}, from_country)
+            or FIND_IN_SET(from_country, #{fromCountry})
+            or from_country='-1'
+            )
+            and (
+            country = #{country}
+            or FIND_IN_SET(#{country}, country)
+            or FIND_IN_SET(country, #{country})
+            or country='-1'
+            )
+            and (
+            trans_line_code = #{transLineCode}
+            or FIND_IN_SET(#{transLineCode}, trans_line_code)
+            or FIND_IN_SET(trans_line_code, #{transLineCode})
+            or trans_line_code='-1'
+            )
+            and (
+            prod_code = #{prodCode}
+            or FIND_IN_SET(#{prodCode}, prod_code)
+            or FIND_IN_SET(prod_code, #{prodCode})
+            or prod_code='-1'
             )
-            <if test="empCode != null and empCode != ''">
-                and (
-                emp_code = #{empCode}
-                or FIND_IN_SET(#{empCode}, emp_code)
-                or FIND_IN_SET(emp_code, #{empCode})
-                or emp_code='-1'
-                )
-            </if>
-            <if test="empName != null and empName != ''">
-                and (
-                emp_name = #{empName}
-                or FIND_IN_SET(#{empName}, emp_name)
-                or FIND_IN_SET(emp_name, #{empName})
-                or emp_name='全部'
-                )
-            </if>
-            <if test="feeType != null and feeType != ''"> and fee_type=#{feeType}</if>
-            <if test="calcType != null and calcType != ''"> and calc_type=#{calcType}</if>
-            <if test="postType != null and postType != ''"> and post_type=#{postType}</if>
-            <if test="transType != null and transType != ''">
-                and (
-                trans_type = #{transType}
-                or FIND_IN_SET(#{transType}, trans_type)
-                or FIND_IN_SET(trans_type, #{transType})
-                )
-            </if>
-            <if test="fromCountry != null and fromCountry != ''">
-                and (
-                from_country = #{fromCountry}
-                or FIND_IN_SET(#{fromCountry}, from_country)
-                or FIND_IN_SET(from_country, #{fromCountry})
-                or from_country='-1'
-                )
-            </if>
-            <if test="country != null and country != ''">
-                and (
-                country = #{country}
-                or FIND_IN_SET(#{country}, country)
-                or FIND_IN_SET(country, #{country})
-                or country='-1'
-                )
-            </if>
-            <if test="transLineCode != null  and transLineCode != ''">
-                and (
-                trans_line_code = #{transLineCode}
-                or FIND_IN_SET(#{transLineCode}, trans_line_code)
-                or FIND_IN_SET(trans_line_code, #{transLineCode})
-                or trans_line_code='-1'
-                )
-            </if>
-            <if test="prodCode != null  and prodCode != ''">
-                and (
-                prod_code = #{prodCode}
-                or FIND_IN_SET(#{prodCode}, prod_code)
-                or FIND_IN_SET(prod_code, #{prodCode})
-                or prod_code='-1'
-                )
-             </if>
         </where>
         order by create_time desc
     </select>