From da48282e5fbc4048b3d583b58c35f85f817371d1 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 4 Jul 2023 17:35:29 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/base/controller/BaseInvoiceController.java  |  6 ++++++
 .../src/main/resources/mapper/BaseSggxcxMapper.xml   | 12 ++++++------
 2 files changed, 12 insertions(+), 6 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 8ffaa74b..bd6e48f6 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
@@ -518,6 +518,9 @@ public class BaseInvoiceController extends AbstractController {
         String suspendStatus = (String) map.get("suspendStastus");
         String suspendDate = (String) map.get("suspendDate");
         String bzr = (String) map.get("bzr");
+        String sortPzbh = String.valueOf(map.get("sortPzbh"));
+        String sortBzdh = String.valueOf(map.get("sortBzdh"));
+        String sortKprq = String.valueOf(map.get("sortKprq"));
         String taxRate = String.valueOf(map.get("taxRate"));
         if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){
             suspendDate = suspendDate.substring(0,7);
@@ -560,6 +563,9 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("imageNumber", map.get("imageNumber"));
         pramsMap.put("suspendStatus",suspendStatus);
         pramsMap.put("suspendDate",suspendDate);
+        pramsMap.put("sortPzbh",sortPzbh);
+        pramsMap.put("sortBzdh",sortBzdh);
+        pramsMap.put("sortKprq",sortKprq);
         pramsMap.put("bzr",bzr);
         if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) {
             String accountPeriod = map.get("accountPeriod").toString().substring(0,7);
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 112184ba..bfff6b16 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -232,22 +232,22 @@
         <if test="taxRate=='多税率'">
             and t.tax_rate like '%,%'
         </if>
-        <if test="sortPzbh == '1'.toString()">
+        <if test="sortPzbh == 1">
             order by t.sn_voucher_number
         </if>
-        <if test="sortPzbh == '2'.toString()">
+        <if test="sortPzbh == 2">
             order by t.sn_voucher_number desc
         </if>
-        <if test="sortBzdh == '1'.toString()">
+        <if test="sortBzdh == 1">
             order by t.bzdh
         </if>
-        <if test="sortBzdh == '2'.toString()">
+        <if test="sortBzdh == 2">
             order by t.bzdh desc
         </if>
-        <if test="sortKprq == '1'.toString()">
+        <if test="sortKprq == 1">
             order by t.invoice_date
         </if>
-        <if test="sortKprq == '2'.toString()">
+        <if test="sortKprq == 2">
             order by t.invoice_date desc
         </if>
     </select>