From d75685de8c2d26f8116ae2bee3e18e48d0e177cc Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 15:06:48 +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

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

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index ea121280..80d8a417 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -235,10 +235,10 @@
         <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!='不征税' 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=='不征税'">
+        <if test="taxRate=='多税率'">
             and t.tax_rate like '%,%'
         </if>
     </select>
@@ -497,10 +497,10 @@
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
-        <if test="taxRate!=null and taxRate!='' 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=='不征税'">
+        <if test="taxRate=='多税率'">
             and t.tax_rate like '%,%'
         </if>
     </select>
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index a1261bfd..dfa74f56 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -220,10 +220,10 @@
         <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 != '不征税' 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=='不征税'">
+        <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'">-->
@@ -562,10 +562,10 @@
         <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!='不征税' 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=='不征税'">
+        <if test="taxRate=='多税率'">
             and t.tax_rate like '%,%'
         </if>
         order by t.bzdh desc