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 47e4e14c..4237364a 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 @@ -141,9 +141,9 @@ public class BaseInvoiceController extends AbstractController { String businessCode = (String)map.get("businessCode"); String qsr = (String)map.get("qsr"); String rzhr = (String)map.get("rzhr"); - String sortPzbh = String.valueOf(map.get("sortPzbh")); - String sortBzdh = String.valueOf(map.get("sortBzdh")); - String sortKprq = String.valueOf(map.get("sortKprq")); +// String sortPzbh = String.valueOf(map.get("sortPzbh")); +// String sortBzdh = String.valueOf(map.get("sortBzdh")); +// String sortKprq = String.valueOf(map.get("sortKprq")); String taxRate = String.valueOf(map.get("taxRate")); log.info("taxRate={}",taxRate); String inAccountStatus = (String)map.get("inAccountStatus"); @@ -172,15 +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")); - if(StringUtils.isNotEmpty(sortPzbh)) { - pramsMap.put("sortPzbh", sortPzbh); - } - if(StringUtils.isNotEmpty(sortBzdh)) { - pramsMap.put("sortBzdh", sortBzdh); - } - if(StringUtils.isNotEmpty(sortKprq)) { - 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)) { diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 374fb859..255c73fa 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -241,24 +241,25 @@ and t.tax_rate like '%,%' - - order by t.sn_voucher_number - - - order by t.sn_voucher_number desc - - - order by t.bzdh - - - order by t.bzdh desc - - - order by t.invoice_date - - - order by t.invoice_date desc - + order by t.invoice_date desc + + + + + + + + + + + + + + + + + +