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] =?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>