From 9b68eafa9d6f92335656dab78eed4ff41e82e3b6 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 20 Jun 2023 16:49:46 +0800
Subject: [PATCH] =?UTF-8?q?arieay=20=E6=9F=A5=E8=AF=A2sql=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A8=8E=E7=8E=87=E5=AD=97=E6=AE=B5=20v4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index d48067b9..14491e68 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -724,17 +724,17 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
-            order by t.qs_date desc,t.invoice_date desc
-        </if>
-        <if test="qsksrq==null or qsksrq=='' or qsjsrq==null or qsjsrq==''">
-            order by t.invoice_date desc
-        </if>
         <if test="taxRate!=null and taxRate!='' and taxRate!='多税率' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
         <if test="taxRate=='多税率'">
             and t.tax_rate like '%,%'
         </if>
+        <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
+            order by t.qs_date desc,t.invoice_date desc
+        </if>
+        <if test="qsksrq==null or qsksrq=='' or qsjsrq==null or qsjsrq==''">
+            order by t.invoice_date desc
+        </if>
     </select>
 </mapper>