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 ad94ed47..757e67b4 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 @@ -136,6 +136,9 @@ public class BaseInvoiceController extends AbstractController { String qsjsrq = (String)map.get("qsjsrq"); String rzksrq = (String)map.get("rzksrq"); String rzjsrq = (String)map.get("rzjsrq"); + String sortPzbh = String.valueOf(map.get("sortPzbh")); + String sortBzdh = String.valueOf(map.get("sortBzdh")); + String sortKprq = String.valueOf(map.get("sortKprq")); String invoiceNo = (String)map.get("invoiceNo"); String xfmc = (String)map.get("xfmc"); String businessCode = (String)map.get("businessCode"); @@ -171,6 +174,9 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("menuId", map.get("menuId")); pramsMap.put("xfmc", xfmc); pramsMap.put("qsr", qsr); + pramsMap.put("sortPzbh",sortPzbh); + pramsMap.put("sortBzdh",sortBzdh); + pramsMap.put("sortKprq",sortKprq); if (StringUtils.isNotBlank(rzhr)) { String[] split = rzhr.split(","); if (!Arrays.asList(split).contains("")) { diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 4972dd13..a1e767c8 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -227,22 +227,22 @@ and t.tax_rate like '%,%' - order by t.sn_voucher_number desc + order by t.sn_voucher_number - order by t.sn_voucher_number + order by t.sn_voucher_number desc - order by t.bzdh desc + order by t.bzdh - order by t.bzdh + order by t.bzdh desc - order by t.invoice_date desc + order by t.invoice_date - order by t.invoice_date + order by t.invoice_date desc