From 230fe825bb1a7ac6833e10f90b71cb95af18802c Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 19:14:20 +0800
Subject: [PATCH] =?UTF-8?q?arieay=20=E4=B8=80=E9=94=AE=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=E6=9D=A1=E4=BB=B6=20&=20?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/BaseRzTDxRecordInvoiceController.java   | 2 ++
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml    | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java
index ab9eda42..48040094 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java
@@ -140,6 +140,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         String qsr = (String)map.get("qsr");
         String bzdh = (String) map.get("bzdh");
         String bzr = (String) map.get("bzr");
+        String taxRate = (String) map.get("taxRate");
         String inAccountStatus = (String) map.get("inAccountStatus");
         String sfkrz = (String)map.get("sfkrz");
         String suspendDate = (String) map.get("suspendDate");
@@ -170,6 +171,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         pramsMap.put("business", getUserInfo().getBusiness());
         pramsMap.put("dbName", getUserInfo().getDbName());
         pramsMap.put("name", getUserName());
+        pramsMap.put("taxRate", taxRate);
         pramsMap.put("loginName", getLoginName());
         List<Tax> taxList = getUserInfo().getOrg();
         pramsMap.put("taxList", taxList);
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 07e4d05f..3bd8dbb1 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1168,6 +1168,12 @@
         <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'">
+            and t.tax_rate = #{taxRate}
+        </if>
+        <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