From 6432870ca83c9963121f725ab6a9f4120debfac0 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 4 Jul 2023 18:42:04 +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=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseInvoiceController.java     | 24 ++++++------
 .../main/resources/mapper/BaseFpZhMapper.xml  | 37 ++++++++++---------
 .../resources/mapper/BaseSggxcxMapper.xml     | 25 +++++++------
 3 files changed, 44 insertions(+), 42 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 47e4e14c..4237364a 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,9 +141,9 @@ public class BaseInvoiceController extends AbstractController {
         String businessCode = (String)map.get("businessCode");
         String qsr = (String)map.get("qsr");
         String rzhr = (String)map.get("rzhr");
-        String sortPzbh = String.valueOf(map.get("sortPzbh"));
-        String sortBzdh = String.valueOf(map.get("sortBzdh"));
-        String sortKprq = String.valueOf(map.get("sortKprq"));
+//        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"));
         log.info("taxRate={}",taxRate);
         String inAccountStatus = (String)map.get("inAccountStatus");
@@ -172,15 +172,15 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
         pramsMap.put("company", map.get("company"));
         pramsMap.put("menuId", map.get("menuId"));
-        if(StringUtils.isNotEmpty(sortPzbh)) {
-            pramsMap.put("sortPzbh", sortPzbh);
-        }
-        if(StringUtils.isNotEmpty(sortBzdh)) {
-            pramsMap.put("sortBzdh", sortBzdh);
-        }
-        if(StringUtils.isNotEmpty(sortKprq)) {
-            pramsMap.put("sortKprq", sortKprq);
-        }
+//        if(StringUtils.isNotEmpty(sortPzbh)) {
+//            pramsMap.put("sortPzbh", sortPzbh);
+//        }
+//        if(StringUtils.isNotEmpty(sortBzdh)) {
+//            pramsMap.put("sortBzdh", sortBzdh);
+//        }
+//        if(StringUtils.isNotEmpty(sortKprq)) {
+//            pramsMap.put("sortKprq", sortKprq);
+//        }
         pramsMap.put("xfmc", xfmc);
         pramsMap.put("qsr", qsr);
         if (StringUtils.isNotBlank(rzhr)) {
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 374fb859..255c73fa 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -241,24 +241,25 @@
         <if test="taxRate=='多税率'">
             and t.tax_rate like '%,%'
         </if>
-        <if test="sortPzbh == 1">
-            order by t.sn_voucher_number
-        </if>
-        <if test="sortPzbh == 2 or sortPzbh == 0">
-            order by t.sn_voucher_number desc
-        </if>
-        <if test="sortBzdh == 1">
-            order by t.bzdh
-        </if>
-        <if test="sortBzdh == 2 or sortBzdh == 0">
-            order by t.bzdh desc
-        </if>
-        <if test="sortKprq == 1">
-            order by t.invoice_date
-        </if>
-        <if test="sortKprq == 2 or sortKprq == 0">
-            order by t.invoice_date desc
-        </if>
+        order by t.invoice_date desc
+<!--        <if test="sortPzbh == 1">-->
+<!--            order by t.sn_voucher_number-->
+<!--        </if>-->
+<!--        <if test="sortPzbh == 2 or sortPzbh == 0">-->
+<!--            order by t.sn_voucher_number desc-->
+<!--        </if>-->
+<!--        <if test="sortBzdh == 1">-->
+<!--            order by t.bzdh-->
+<!--        </if>-->
+<!--        <if test="sortBzdh == 2 or sortBzdh == 0">-->
+<!--            order by t.bzdh desc-->
+<!--        </if>-->
+<!--        <if test="sortKprq == 1">-->
+<!--            order by t.invoice_date-->
+<!--        </if>-->
+<!--        <if test="sortKprq == 2 or sortKprq == 0">-->
+<!--            order by t.invoice_date desc-->
+<!--        </if>-->
     </select>
     <!-- order by t.rzh_date desc,t.invoice_date desc-->
     <select id="selectByPramsMap" 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 4a35035a..6e996ad1 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -233,24 +233,25 @@
         <if test="taxRate=='多税率'">
             and t.tax_rate like '%,%'
         </if>
-        <if test="sortPzbh == 1">
-            order by t.sn_voucher_number
+        <if test="sortKprq == 1">
+            order by t.invoice_date
         </if>
-        <if test="sortPzbh == 2 or sortPzbh == 0">
-            order by t.sn_voucher_number desc
+        <if test="sortKprq == 2">
+            order by t.invoice_date desc
         </if>
-        <if test="sortBzdh == 1">
-            order by t.bzdh
+        <if test="sortPzbh == 1">
+            ,t.sn_voucher_number
         </if>
-        <if test="sortBzdh == 2 or sortBzdh == 0">
-            order by t.bzdh desc
+        <if test="sortPzbh == 2">
+            ,t.sn_voucher_number desc
         </if>
-        <if test="sortKprq == 1">
-            order by t.invoice_date
+        <if test="sortBzdh == 1">
+            ,t.bzdh
         </if>
-        <if test="sortKprq == 2 or sortKprq == 0">
-            order by t.invoice_date desc
+        <if test="sortBzdh == 2">
+            ,t.bzdh desc
         </if>
+
     </select>
     <select id="selectDksh" parameterType="java.util.Map"
             resultType="com.dxhy.base.entity.BaseTDxDkCount"