From 76877a3515c4beb4c010faf45902bd4353e87cd3 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 4 Jul 2023 10:23:10 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=20v2?=
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 ad94ed47..757e67b4 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
@@ -136,6 +136,9 @@ public class BaseInvoiceController extends AbstractController {
         String qsjsrq = (String)map.get("qsjsrq");
         String rzksrq = (String)map.get("rzksrq");
         String rzjsrq = (String)map.get("rzjsrq");
+        String sortPzbh = String.valueOf(map.get("sortPzbh"));
+        String sortBzdh = String.valueOf(map.get("sortBzdh"));
+        String sortKprq = String.valueOf(map.get("sortKprq"));
         String invoiceNo = (String)map.get("invoiceNo");
         String xfmc = (String)map.get("xfmc");
         String businessCode = (String)map.get("businessCode");
@@ -171,6 +174,9 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("menuId", map.get("menuId"));
         pramsMap.put("xfmc", xfmc);
         pramsMap.put("qsr", qsr);
+        pramsMap.put("sortPzbh",sortPzbh);
+        pramsMap.put("sortBzdh",sortBzdh);
+        pramsMap.put("sortKprq",sortKprq);
         if (StringUtils.isNotBlank(rzhr)) {
             String[] split = rzhr.split(",");
             if (!Arrays.asList(split).contains("")) {
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 4972dd13..a1e767c8 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -227,22 +227,22 @@
             and t.tax_rate like '%,%'
         </if>
         <if test="sortPzbh == 1">
-            order by t.sn_voucher_number desc
+            order by t.sn_voucher_number
         </if>
         <if test="sortPzbh == 2">
-            order by t.sn_voucher_number
+            order by t.sn_voucher_number desc
         </if>
         <if test="sortBzdh == 1">
-            order by t.bzdh desc
+            order by t.bzdh
         </if>
         <if test="sortBzdh == 2">
-            order by t.bzdh
+            order by t.bzdh desc
         </if>
         <if test="sortKprq == 1">
-            order by t.invoice_date desc
+            order by t.invoice_date
         </if>
         <if test="sortKprq == 2">
-            order by t.invoice_date
+            order by t.invoice_date desc
         </if>
         <!--limit #{curr},#{size}-->
 <!--        <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">-->