ariesy 增加排序参数

dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@@ -172,9 +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"));
-        pramsMap.put("sortPzbh",sortPzbh);
-        pramsMap.put("sortBzdh",sortBzdh);
-        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)) {

dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@@ -244,19 +244,19 @@
         <if test="sortPzbh == 1">
             order by t.sn_voucher_number
         </if>
-        <if test="sortPzbh == 2">
+        <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">
+        <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">
+        <if test="sortKprq == 2 or sortKprq == 0">
             order by t.invoice_date desc
         </if>
     </select>

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -94,6 +94,12 @@
             c.select_end_date or d.tj_status in ('1','2'))
 
         </if>
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
+            and t.bzdh = #{bzdh}
+        </if>
+        <if test=" bzdh == ''">
+            and t.bzdh is not null
+        </if>
         <if test="sign !='88'">
             and t.gf_tax_no in
             <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
@@ -133,12 +139,7 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
-        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
-            and t.bzdh = #{bzdh}
-        </if>
-        <if test=" bzdh == ''">
-            and t.bzdh is not null
-        </if>
+
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
@@ -235,19 +236,19 @@
         <if test="sortPzbh == 1">
             order by t.sn_voucher_number
         </if>
-        <if test="sortPzbh == 2">
+        <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">
+        <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">
+        <if test="sortKprq == 2 or sortKprq == 0">
             order by t.invoice_date desc
         </if>
     </select>