From 5f09d6763f511a29f2ced5c80ffcb4320e512c92 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 4 Jul 2023 10:31:06 +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

---
 .../main/resources/mapper/BaseFpZhMapper.xml  | 19 ++++++++++++++++++-
 .../resources/mapper/BaseSggxcxMapper.xml     | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index bdc533c0..0f3ae8eb 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -241,7 +241,24 @@
         <if test="taxRate=='多税率'">
             and t.tax_rate like '%,%'
         </if>
-
+        <if test="sortPzbh == 1">
+            order by t.sn_voucher_number
+        </if>
+        <if test="sortPzbh == 2">
+            order by t.sn_voucher_number desc
+        </if>
+        <if test="sortBzdh == 1">
+            order by t.bzdh
+        </if>
+        <if test="sortBzdh == 2">
+            order by t.bzdh desc
+        </if>
+        <if test="sortKprq == 1">
+            order by t.invoice_date
+        </if>
+        <if test="sortKprq == 2">
+            order by t.invoice_date desc
+        </if>
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
             resultMap="BaseResultMap" databaseId="oracle">
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index e781c0a8..34663b56 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -226,7 +226,24 @@
 <!--        <if test="qsksrq==null or qsksrq=='' or qsjsrq==null or qsjsrq==''">-->
 <!--            order by t.invoice_date desc-->
 <!--        </if>-->
-        order by t.bzdh desc
+        <if test="sortPzbh == 1">
+            order by t.sn_voucher_number
+        </if>
+        <if test="sortPzbh == 2">
+            order by t.sn_voucher_number desc
+        </if>
+        <if test="sortBzdh == 1">
+            order by t.bzdh
+        </if>
+        <if test="sortBzdh == 2">
+            order by t.bzdh desc
+        </if>
+        <if test="sortKprq == 1">
+            order by t.invoice_date
+        </if>
+        <if test="sortKprq == 2">
+            order by t.invoice_date desc
+        </if>
     </select>
     <select id="selectDksh" parameterType="java.util.Map"
             resultType="com.dxhy.base.entity.BaseTDxDkCount"