From 7fd6a998f1e150275cdee18ccccb6142cb8e0e5d Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 08:32:19 +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=20v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 50945aa5..ea121280 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'">
+        <if test="taxRate!=null and taxRate!='' and taxRate!='不征税' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
-        <if test="taxRate==''">
-            and t.tax_rate = #{taxRate}
+        <if test="taxRate=='不征税'">
+            and t.tax_rate like '%,%'
         </if>
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
@@ -497,11 +497,11 @@
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
-        <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
+        <if test="taxRate!=null and taxRate!='' and taxRate!='不征税' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
-        <if test="taxRate==''">
-            and t.tax_rate = #{taxRate}
+        <if test="taxRate=='不征税'">
+            and t.tax_rate like '%,%'
         </if>
     </select>
     <select id="selectRzfpHj" parameterType="java.util.Map"
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 26b56df2..6dd64774 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -217,11 +217,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'">
+        <if test="taxRate!=null and taxRate!='' and taxRate != '不征税' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
-        <if test="taxRate==''">
-            and t.tax_rate = #{taxRate}
+        <if test="taxRate=='不征税'">
+            and t.tax_rate like '%,%'
         </if>
 <!--        <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">-->
 <!--            order by t.qs_date desc,t.invoice_date desc-->
@@ -559,11 +559,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'">
+        <if test="taxRate!=null and taxRate!='' and taxRate!='不征税' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
-        <if test="taxRate==''">
-            and t.tax_rate = #{taxRate}
+        <if test="taxRate=='不征税'">
+            and t.tax_rate like '%,%'
         </if>
         order by t.bzdh desc
     </select>