From 6c2b74df0a09ccc3efa4223dd4b528234f603080 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 19 Jun 2023 16:39:02 +0800
Subject: [PATCH] =?UTF-8?q?arieay=20=E6=9F=A5=E8=AF=A2sql=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A8=8E=E7=8E=87=E5=AD=97=E6=AE=B5=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/BaseFpZhMapper.xml | 16 +++++-----------
 .../main/resources/mapper/BaseSggxcxMapper.xml   | 14 +-------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 88f3c498..cc45a393 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -235,11 +235,11 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        <if test="taxRate != null and taxRate != '' and taxRate != 'null' and taxRate != '99'">
-            and (t.tax_rate in
-            <foreach collection="rates" index="index" item="taxRate" separator="," open="(" close=")">
-                #{taxRate}
-            </foreach>
+        <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
+            and t.tax_rate like %#{taxRate}%
+        </if>
+        <if test="taxRate==''">
+            and t.tax_rate  #{taxRate}
         </if>
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
@@ -406,12 +406,6 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="taxRate != null and taxRate != '' and taxRate != 'null' and taxRate != '99'">
-            and (t.tax_rate in
-            <foreach collection="rates" index="index" item="taxRate" separator="," open="(" close=")">
-                #{taxRate}
-            </foreach>
-        </if>
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index cb70d92e..92683a9d 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -136,12 +136,6 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="taxRate != null and taxRate != '' and taxRate != 'null' and taxRate != '99'">
-            and (t.tax_rate in
-            <foreach collection="rates" index="index" item="taxRate" separator="," open="(" close=")">
-                #{taxRate}
-            </foreach>
-        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
@@ -521,12 +515,6 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="taxRate != null and taxRate != '' and taxRate != 'null' and taxRate != '99'">
-            and (t.tax_rate in
-            <foreach collection="rates" index="index" item="taxRate" separator="," open="(" close=")">
-                #{taxRate}
-            </foreach>
-        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
@@ -575,7 +563,7 @@
             and t.tax_rate like %#{taxRate}%
         </if>
         <if test="taxRate==''">
-            and t.tax_rate  #{taxRate}
+            and t.tax_rate like #{taxRate}
         </if>
         order by t.bzdh desc
     </select>