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 f4c500de..f11f97c0 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 @@ -512,6 +512,10 @@ public class BaseInvoiceController extends AbstractController { String suspendDate = (String) map.get("suspendDate"); String bzr = (String) map.get("bzr"); String taxRate = String.valueOf(map.get("taxRate")); + + String sortPzbh = String.valueOf(map.get("sortPzbh")); + String sortBzdh = String.valueOf(map.get("sortBzdh")); + String sortKprq = String.valueOf(map.get("sortKprq")); if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){ suspendDate = suspendDate.substring(0,7); } @@ -553,6 +557,10 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("imageNumber", map.get("imageNumber")); pramsMap.put("suspendStatus",suspendStatus); pramsMap.put("suspendDate",suspendDate); + + pramsMap.put("sortPzbh",sortPzbh); + pramsMap.put("sortBzdh",sortBzdh); + pramsMap.put("sortKprq",sortKprq); pramsMap.put("bzr",bzr); if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) { String accountPeriod = map.get("accountPeriod").toString().substring(0,7); diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index e781c0a8..eb0019ad 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -556,7 +556,24 @@ and t.account_period = #{accountPeriod} - order by t.bzdh desc + + order by t.sn_voucher_number desc + + + order by t.sn_voucher_number + + + order by t.bzdh desc + + + order by t.bzdh + + + order by t.invoice_date desc + + + order by t.invoice_date +