From bf533c30dbd72004bdc1002bf2d7d75a04e37de2 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 27 Jun 2023 19:43:36 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=87=AD=E8=AF=81=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E6=8A=A5=E8=B4=A6=E5=8D=95=E5=8F=B7=E3=80=81?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=97=A5=E6=9C=9F=E4=B8=89=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseInvoiceController.java     |  8 ++++++++
 .../resources/mapper/BaseSggxcxMapper.xml     | 19 ++++++++++++++++++-
 2 files changed, 26 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 f4c500de..f11f97c0 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
@@ -512,6 +512,10 @@ public class BaseInvoiceController extends AbstractController {
         String suspendDate = (String) map.get("suspendDate");
         String bzr = (String) map.get("bzr");
         String taxRate = String.valueOf(map.get("taxRate"));
+
+        String sortPzbh = String.valueOf(map.get("sortPzbh"));
+        String sortBzdh = String.valueOf(map.get("sortBzdh"));
+        String sortKprq = String.valueOf(map.get("sortKprq"));
         if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){
             suspendDate = suspendDate.substring(0,7);
         }
@@ -553,6 +557,10 @@ 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 e781c0a8..eb0019ad 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -556,7 +556,24 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        order by t.bzdh desc
+        <if test="sortPzbh == '1'">
+            order by t.sn_voucher_number desc
+        </if>
+        <if test="sortPzbh == '2'">
+            order by t.sn_voucher_number
+        </if>
+        <if test="sortBzdh == '1'">
+            order by t.bzdh desc
+        </if>
+        <if test="sortBzdh == '2'">
+            order by t.bzdh
+        </if>
+        <if test="sortKprq == '1'">
+            order by t.invoice_date desc
+        </if>
+        <if test="sortKprq == '2'">
+            order by t.invoice_date
+        </if>
     </select>
 
     <select id="selectHj" parameterType="java.util.Map"