From 76a3e14e17e39332e5bed43e3705137bdcbfc43b Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Wed, 14 Jun 2023 15:48:13 +0800
Subject: [PATCH 01/22] =?UTF-8?q?ariesy=20=E6=89=8B=E5=B7=A5=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=92=8C=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseInvoiceController.java     | 64 +++++++++++++++++++
 .../main/resources/mapper/BaseFpZhMapper.xml  | 12 ++++
 .../resources/mapper/BaseSggxcxMapper.xml     | 12 ++++
 3 files changed, 88 insertions(+)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 599b388c..8902f369 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -141,6 +141,7 @@ public class BaseInvoiceController extends AbstractController {
         String businessCode = (String)map.get("businessCode");
         String qsr = (String)map.get("qsr");
         String rzhr = (String)map.get("rzhr");
+        String taxRate = (String) map.get("taxRate");
         String inAccountStatus = (String)map.get("inAccountStatus");
         int curr = (int)map.get("curr");
         int size = (int)map.get("size");
@@ -225,6 +226,12 @@ public class BaseInvoiceController extends AbstractController {
             pramsMap.put("companyCode",companyCode);
         }
 
+        if (!StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
+            List<String> rates = new ArrayList<>();
+            rates = convertRates(taxRate,rates);
+            pramsMap.put("taxRate",rates);
+        }
+
         if (!StringHelper.isBlank(invoiceType)) {
             if (!"99".equals(invoiceType)) {
                 pramsMap.put("invoiceType", invoiceType);
@@ -503,6 +510,7 @@ public class BaseInvoiceController extends AbstractController {
         String suspendStatus = (String) map.get("suspendStastus");
         String suspendDate = (String) map.get("suspendDate");
         String bzr = (String) map.get("bzr");
+        String taxRate = (String) map.get("taxRate");
         if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){
             suspendDate = suspendDate.substring(0,7);
         }
@@ -566,6 +574,12 @@ public class BaseInvoiceController extends AbstractController {
         if (!StringUtils.isNotBlank(gfsh)){
             pramsMap.put("sign","88");
         }
+
+        if (!StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
+            List<String> rates = new ArrayList<>();
+            rates = convertRates(taxRate,rates);
+            pramsMap.put("taxRate",rates);
+        }
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
             gfshList.add(gfsh);
@@ -694,6 +708,56 @@ public class BaseInvoiceController extends AbstractController {
 
     }
 
+    private List<String> convertRates(String taxRate,List<String> rates) {
+        switch (taxRate) {
+            case "0":
+                rates.add("0");
+                break;
+            case "1.5":
+                rates.add("1.5");
+                break;
+            case "2":
+                rates.add("2");
+                rates.add("0.02");
+                break;
+            case "3":
+                rates.add("3");
+                rates.add("0.03");
+                break;
+            case "5":
+                rates.add("5");
+                rates.add("0.05");
+                break;
+            case "6":
+                rates.add("6");
+                rates.add("0.06");
+                break;
+            case "9":
+                rates.add("9");
+                rates.add("0.09");
+                break;
+            case "10":
+                rates.add("10");
+                rates.add("0.10");
+                break;
+            case "13":
+                rates.add("13");
+                rates.add("0.13");
+                break;
+            case "16":
+                rates.add("16");
+                rates.add("0.16");
+                break;
+            case "17":
+                rates.add("17");
+                rates.add("0.17");
+                break;
+            default:
+                break;
+        }
+        return rates;
+    }
+
     public boolean checkList(List<String> list) {
         boolean flag =false;
         if (list == null || list.isEmpty()){
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 18b4e39f..4ac582fe 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -235,6 +235,12 @@
         <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>
         order by t.rzh_date desc,t.invoice_date desc
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
@@ -401,6 +407,12 @@
         <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 cf4a629a..76712016 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -136,6 +136,12 @@
         <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>
@@ -509,6 +515,12 @@
         <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>

From c722d5132e8d2e9adf4951d19174c07d3e784f4d Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 19 Jun 2023 11:31:14 +0800
Subject: [PATCH 02/22] =?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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/base/controller/BaseInvoiceController.java  | 4 ++--
 dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml        | 2 +-
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 8902f369..beeb0c26 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -141,7 +141,7 @@ public class BaseInvoiceController extends AbstractController {
         String businessCode = (String)map.get("businessCode");
         String qsr = (String)map.get("qsr");
         String rzhr = (String)map.get("rzhr");
-        String taxRate = (String) map.get("taxRate");
+        String taxRate = String.valueOf(map.get("taxRate"));
         String inAccountStatus = (String)map.get("inAccountStatus");
         int curr = (int)map.get("curr");
         int size = (int)map.get("size");
@@ -510,7 +510,7 @@ public class BaseInvoiceController extends AbstractController {
         String suspendStatus = (String) map.get("suspendStastus");
         String suspendDate = (String) map.get("suspendDate");
         String bzr = (String) map.get("bzr");
-        String taxRate = (String) map.get("taxRate");
+        String taxRate = String.valueOf(map.get("taxRate"));
         if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){
             suspendDate = suspendDate.substring(0,7);
         }
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 4ac582fe..312ac7bb 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -71,7 +71,7 @@
         t.rzh_belong_date as dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.out_status,
         t.bdk_status,t.bdk_current_period,date_format(t.bdk_date,'%Y-%m-%d')
         bdk_date,t.rzh_back_msg,t.in_account_status,t.payment_status,date_format(t.payment_date,'%Y-%m-%d')payment_date,
-        voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id
+        voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id,tax_rate
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 76712016..da24283d 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -69,7 +69,7 @@
         case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when
         true then 1
         else 2 end authStatus,t.bzdh,t.suspend_status,t.suspend_date,
-        t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no
+        t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no,t.tax_rate
         from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno
         left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}

From fb030aee6988564631cff036df0832b85fd90792 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 19 Jun 2023 15:16:08 +0800
Subject: [PATCH 03/22] =?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

---
 .../dxhy/base/controller/BaseInvoiceController.java  | 12 ++++++------
 .../src/main/resources/mapper/BaseFpZhMapper.xml     |  7 ++++++-
 .../src/main/resources/mapper/BaseSggxcxMapper.xml   | 12 ++++++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index beeb0c26..085d02c9 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -227,9 +227,9 @@ public class BaseInvoiceController extends AbstractController {
         }
 
         if (!StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
-            List<String> rates = new ArrayList<>();
-            rates = convertRates(taxRate,rates);
-            pramsMap.put("taxRate",rates);
+//            List<String> rates = new ArrayList<>();
+//            rates = convertRates(taxRate,rates);
+            pramsMap.put("taxRate",taxRate);
         }
 
         if (!StringHelper.isBlank(invoiceType)) {
@@ -576,9 +576,9 @@ public class BaseInvoiceController extends AbstractController {
         }
 
         if (!StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
-            List<String> rates = new ArrayList<>();
-            rates = convertRates(taxRate,rates);
-            pramsMap.put("taxRate",rates);
+//            List<String> rates = new ArrayList<>();
+//            rates = convertRates(taxRate,rates);
+            pramsMap.put("taxRate",taxRate);
         }
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 312ac7bb..88f3c498 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -241,7 +241,6 @@
                 #{taxRate}
             </foreach>
         </if>
-        order by t.rzh_date desc,t.invoice_date desc
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
             resultMap="BaseResultMap" databaseId="oracle">
@@ -504,6 +503,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 != null and taxRate !='99'">
+            and t.tax_rate like %#{taxRate}%
+        </if>
+        <if test="taxRate==''">
+            and t.tax_rate  #{taxRate}
+        </if>
     </select>
     <select id="selectRzfpHj" parameterType="java.util.Map"
             resultMap="RzcxhjResultMap" databaseId="oracle">
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index da24283d..cb70d92e 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -223,6 +223,12 @@
         <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 like %#{taxRate}%
+        </if>
+        <if test="taxRate==''">
+            and t.tax_rate  #{taxRate}
+        </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-->
 <!--        </if>-->
@@ -565,6 +571,12 @@
         <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 like %#{taxRate}%
+        </if>
+        <if test="taxRate==''">
+            and t.tax_rate  #{taxRate}
+        </if>
         order by t.bzdh desc
     </select>
 

From bce3a617c1cd7ddafcac0cfdae471af8702b2c97 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 19 Jun 2023 16:15:46 +0800
Subject: [PATCH 04/22] =?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

---
 .../java/com/dxhy/base/controller/BaseInvoiceController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 085d02c9..b2b35b7d 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -575,7 +575,7 @@ public class BaseInvoiceController extends AbstractController {
             pramsMap.put("sign","88");
         }
 
-        if (!StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
+        if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
 //            List<String> rates = new ArrayList<>();
 //            rates = convertRates(taxRate,rates);
             pramsMap.put("taxRate",taxRate);

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 05/22] =?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>

From ecf4fc5b7f83ee5a3547a75857805bb36b421933 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 19 Jun 2023 17:37:36 +0800
Subject: [PATCH 06/22] =?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

---
 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 cc45a393..50945aa5 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -236,10 +236,10 @@
             and t.account_period = #{accountPeriod}
         </if>
         <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
-            and t.tax_rate like %#{taxRate}%
+            and t.tax_rate = #{taxRate}
         </if>
         <if test="taxRate==''">
-            and t.tax_rate  #{taxRate}
+            and t.tax_rate = #{taxRate}
         </if>
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
@@ -498,10 +498,10 @@
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
         <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
-            and t.tax_rate like %#{taxRate}%
+            and t.tax_rate = #{taxRate}
         </if>
         <if test="taxRate==''">
-            and t.tax_rate  #{taxRate}
+            and t.tax_rate = #{taxRate}
         </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 92683a9d..26b56df2 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -218,10 +218,10 @@
             and t.account_period = #{accountPeriod}
         </if>
         <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
-            and t.tax_rate like %#{taxRate}%
+            and t.tax_rate = #{taxRate}
         </if>
         <if test="taxRate==''">
-            and t.tax_rate  #{taxRate}
+            and t.tax_rate = #{taxRate}
         </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-->
@@ -560,10 +560,10 @@
             and t.account_period = #{accountPeriod}
         </if>
         <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
-            and t.tax_rate like %#{taxRate}%
+            and t.tax_rate = #{taxRate}
         </if>
         <if test="taxRate==''">
-            and t.tax_rate like #{taxRate}
+            and t.tax_rate = #{taxRate}
         </if>
         order by t.bzdh desc
     </select>

From 4de9065fad17fdc4d66fd31f6315c227420cdecd Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 19 Jun 2023 18:09:27 +0800
Subject: [PATCH 07/22] =?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/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java | 1 +
 dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java  | 1 +
 .../src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java      | 1 +
 .../java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java | 1 +
 .../service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
index 695fc016..a62b7360 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
@@ -522,4 +522,5 @@ public class BaseTDxRecordInvoice implements Serializable {
     private String suspendDate;
 
     private String bzr;
+    private String taxRate;
 }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
index ed2660ec..178a4ab0 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
@@ -211,6 +211,7 @@ public class BaseFpRzRespVO implements Serializable {
     private String compCode;
 
     private String bzr;
+    private String taxRate;
 
 
 }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
index 085f0547..8b9ef21c 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
@@ -166,4 +166,5 @@ public class BaseSggxCxRespVO {
     private String bzr;
 
     private String uuid;
+    private String taxRate;
 }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
index eaacf6a4..ea23ac18 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
@@ -203,6 +203,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         }
                         pageList.get(i).setRzsj(pageList.get(i).getRzsj());
                         pageList.get(i).setSkssq(pageList.get(i).getSkssq());
+                        pageList.get(i).setTaxRate(pageList.get(i).getTaxRate());
                     }
                 }
 
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index a8b20f6f..de7cc019 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
@@ -222,6 +222,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     vo.setXfmc(pageList.get(i).getXfName());
                     vo.setBusinessName(businessName);
                     vo.setEleInvoiceNo(pageList.get(i).getEleInvoiceNo());
+                    vo.setTaxRate(pageList.get(i).getTaxRate());
 //                    String dkzt= dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus());
 //                    pageList.get(i).setInAccountStatus(dkzt);
 //                    vo.setInAccountStatus(dkzt);

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 08/22] =?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>

From 93a3e8e9e8db44bb8f16df230e91a741e7eff7af Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 11:43:31 +0800
Subject: [PATCH 09/22] =?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/BaseSggxcxMapper.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 6dd64774..8d328737 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -136,12 +136,12 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzdh == ''">
+            and t.bzdh is not null and t.in_account_status = '1'
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
-            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
-        </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}
         </if>

From de9fb71f66b99f98f8905e216940d7905aedd0cc Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 14:13:37 +0800
Subject: [PATCH 10/22] =?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/BaseSggxcxMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 8d328737..3f80827a 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -137,7 +137,7 @@
             and t.bzdh = #{bzdh}
         </if>
         <if test="bzdh == ''">
-            and t.bzdh is not null and t.in_account_status = '1'
+            and t.bzdh is not null and t.inaccount_status = '1'
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}

From d8ba256b1a2ffd5040e322c3926b368ca53692bb Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 14:26:14 +0800
Subject: [PATCH 11/22] =?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/BaseSggxcxMapper.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 3f80827a..a1261bfd 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -136,12 +136,15 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="bzdh == ''">
+        <if test=" bzdh == ''">
             and t.bzdh is not null and t.inaccount_status = '1'
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and t.inaccount_status = '0'
+        </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}
         </if>

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 12/22] =?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

From cf3e1deea75edb404cf31da1d2f6724c0ae33d8f Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 15:38:42 +0800
Subject: [PATCH 13/22] =?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=20v4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/BaseFpZhMapper.xml     |  2 +-
 .../com/dxhy/core/thread/ManualAthensThread.java     |  2 ++
 .../com/dxhy/core/thread/RzFpxxExportThread.java     |  2 ++
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml   | 12 ++++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 80d8a417..c7ef4abd 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -71,7 +71,7 @@
         t.rzh_belong_date as dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.out_status,
         t.bdk_status,t.bdk_current_period,date_format(t.bdk_date,'%Y-%m-%d')
         bdk_date,t.rzh_back_msg,t.in_account_status,t.payment_status,date_format(t.payment_date,'%Y-%m-%d')payment_date,
-        voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id,tax_rate
+        voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id,t.tax_rate
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
index ada14005..b9295fa1 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
@@ -150,6 +150,7 @@ public class ManualAthensThread extends BaseThread {
                 String cjjsyf = prams.getString("cjjsyf");
                 String gfTaxNo = prams.getString("gfTaxNo");
                 String bzr = prams.getString("bzr");
+                String taxRate = String.valueOf(prams.getInteger("taxRate"));
                 String suspendStatus = prams.getString("suspendStastus");
                 String suspendDate = prams.getString("suspendDate");
                 String inAccountStatus = prams.getString("inAccountStatus");
@@ -221,6 +222,7 @@ public class ManualAthensThread extends BaseThread {
                 pramsMap.put("rzzt", rzzt);
                 pramsMap.put("rzlx", rzlx);
                 pramsMap.put("rzr", rzr);
+                pramsMap.put("taxRate", taxRate);
                 pramsMap.put("inAccountStatus", inAccountStatus);
                 pramsMap.put("company", company);
                 pramsMap.put("invoiceSource",prams.getString("invoiceSource"));
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
index 28d820dc..6c674297 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
@@ -140,6 +140,7 @@ public class RzFpxxExportThread extends BaseThread {
                 String menuId = prams.getString("menuId");
                 String bzdh = prams.getString("bzdh");
                 String bzr = prams.getString("bzr");
+                String taxRate = String.valueOf(prams.getInteger("taxRate"));
                 JSONArray companyCodeArray = prams.getJSONArray("companyCodes");
                 String snVoucherNumber = prams.getString("snVoucherNumber");
                 String imageNumber = prams.getString("imageNumber");
@@ -176,6 +177,7 @@ public class RzFpxxExportThread extends BaseThread {
                 pramsMap.put("paymentStatus", prams.getString("paymentStatus"));
                 pramsMap.put("bzdh",bzdh);
                 pramsMap.put("bzr",bzr);
+                pramsMap.put("taxRate", taxRate);
                 pramsMap.put("companyCodes",companyCodes);
 
                 if (StringHelper.isBlank(gfsh)){
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 28250108..d48067b9 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -259,6 +259,12 @@
         <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'">
+            and t.tax_rate = #{taxRate}
+        </if>
+        <if test="taxRate=='多税率'">
+            and t.tax_rate like '%,%'
+        </if>
         order by t.rzh_date desc,t.invoice_date desc
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
@@ -724,5 +730,11 @@
         <if test="qsksrq==null or qsksrq=='' or qsjsrq==null or qsjsrq==''">
             order by t.invoice_date desc
         </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>
     </select>
 </mapper>

From b95f552348064185ff00db7948b87e014aa0bacc Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 16:07:21 +0800
Subject: [PATCH 14/22] =?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=20v4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/base/controller/BaseInvoiceController.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index b2b35b7d..f4c500de 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -142,6 +142,7 @@ public class BaseInvoiceController extends AbstractController {
         String qsr = (String)map.get("qsr");
         String rzhr = (String)map.get("rzhr");
         String taxRate = String.valueOf(map.get("taxRate"));
+        log.info("taxRate={}",taxRate);
         String inAccountStatus = (String)map.get("inAccountStatus");
         int curr = (int)map.get("curr");
         int size = (int)map.get("size");
@@ -226,7 +227,7 @@ public class BaseInvoiceController extends AbstractController {
             pramsMap.put("companyCode",companyCode);
         }
 
-        if (!StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
+        if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
 //            List<String> rates = new ArrayList<>();
 //            rates = convertRates(taxRate,rates);
             pramsMap.put("taxRate",taxRate);

From 9b68eafa9d6f92335656dab78eed4ff41e82e3b6 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 16:49:46 +0800
Subject: [PATCH 15/22] =?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=20v4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index d48067b9..14491e68 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -724,17 +724,17 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </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
-        </if>
-        <if test="qsksrq==null or qsksrq=='' or qsjsrq==null or qsjsrq==''">
-            order by t.invoice_date desc
-        </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
+        </if>
+        <if test="qsksrq==null or qsksrq=='' or qsjsrq==null or qsjsrq==''">
+            order by t.invoice_date desc
+        </if>
     </select>
 </mapper>

From 760db42ba66c9c1f1790ae8412dc6441abdbd0ab Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 17:18:26 +0800
Subject: [PATCH 16/22] =?UTF-8?q?arieay=20=E4=B8=80=E9=94=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=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 eef0a688..9b9682cc 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
@@ -319,6 +319,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.valueOf(map.get("taxRate"));
         String inAccountStatus = (String) map.get("inAccountStatus");
         String sfkrz = (String)map.get("sfkrz");
         String suspendDate = (String) map.get("suspendDate");
@@ -356,6 +357,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
         pramsMap.put("postingTimeStart", map.get("postingTimeStart"));
         pramsMap.put("company", map.get("company"));
+        pramsMap.put("taxRate", map.get("taxRate"));
 
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index dfa74f56..fde2e3b4 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1403,6 +1403,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>
 
     </select>
     <select id="selectRzhAllHj" parameterType="java.util.Map"

From 3d29aa81fcfc07f2a90216d561f49afbfea1f544 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 17:58:30 +0800
Subject: [PATCH 17/22] =?UTF-8?q?arieay=20=E4=B8=80=E9=94=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=20&=20=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=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/BaseFpZhMapper.xml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 9b9682cc..ab9eda42 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
@@ -357,7 +357,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
         pramsMap.put("postingTimeStart", map.get("postingTimeStart"));
         pramsMap.put("company", map.get("company"));
-        pramsMap.put("taxRate", map.get("taxRate"));
+        pramsMap.put("taxRate", taxRate);
 
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index c7ef4abd..6e4af301 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -77,7 +77,7 @@
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
-        and t.auth_status != '0'
+        and t.auth_status in ('2','3','4')
         and t.company = #{company}
         <if test="sign != '88'">
             and t.gf_tax_no in
@@ -360,7 +360,7 @@
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
-        and t.auth_status != '0'
+        and t.auth_status in ('2','3','4')
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.company =#{company}

From e49c198e29db879ce711f6a36002f311741c1cb7 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 18:51:15 +0800
Subject: [PATCH 18/22] =?UTF-8?q?arieay=20=E4=B8=80=E9=94=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=20&=20=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=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

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index fde2e3b4..07e4d05f 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1331,6 +1331,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzdh == ''">
+            and t.bzdh is not null and t.inaccount_status = '1'
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>

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 19/22] =?UTF-8?q?arieay=20=E4=B8=80=E9=94=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=20&=20=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=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

From fcf31232a67b360c6c8fb42eb9937a458a6c3181 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 19:25:26 +0800
Subject: [PATCH 20/22] =?UTF-8?q?arieay=20=E4=B8=80=E9=94=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=20&=20=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=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

---
 .../dxhy/base/controller/BaseRzTDxRecordInvoiceController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 48040094..4ed33bc5 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,7 +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 taxRate = String.valueOf(map.get("taxRate"));
         String inAccountStatus = (String) map.get("inAccountStatus");
         String sfkrz = (String)map.get("sfkrz");
         String suspendDate = (String) map.get("suspendDate");

From 95a4aee840529ae64ea3e74c2d16a9ea080341f8 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 19:34:10 +0800
Subject: [PATCH 21/22] =?UTF-8?q?arieay=20=E4=B8=80=E9=94=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=20&=20=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=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

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 3bd8dbb1..893bd738 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1094,6 +1094,9 @@
             and t.bzr like concat('%',#{bzr},'%')
         </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
+            and t.bzdh is not null and t.inaccount_status = '1'
+        </if>
+        <if test="bzdh  == ''">
             and t.bzdh = #{bzdh}
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">

From a2319112edffbdb9b8ccaca1dd36b27e539265d1 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 19:35:49 +0800
Subject: [PATCH 22/22] =?UTF-8?q?arieay=20=E4=B8=80=E9=94=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=20&=20=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=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

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 893bd738..33ad4f83 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1094,10 +1094,10 @@
             and t.bzr like concat('%',#{bzr},'%')
         </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
-            and t.bzdh is not null and t.inaccount_status = '1'
+            and t.bzdh = #{bzdh}
         </if>
         <if test="bzdh  == ''">
-            and t.bzdh = #{bzdh}
+            and t.bzdh is not null and t.inaccount_status = '1'
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}