Merge branches '0614-增加税率筛选条件' and 'test' of http://192.168.12.182/invoice/pt into test

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>