diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java index ab9eda42..48040094 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java @@ -140,6 +140,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController { String qsr = (String)map.get("qsr"); String bzdh = (String) map.get("bzdh"); String bzr = (String) map.get("bzr"); + String taxRate = (String) map.get("taxRate"); String inAccountStatus = (String) map.get("inAccountStatus"); String sfkrz = (String)map.get("sfkrz"); String suspendDate = (String) map.get("suspendDate"); @@ -170,6 +171,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController { pramsMap.put("business", getUserInfo().getBusiness()); pramsMap.put("dbName", getUserInfo().getDbName()); pramsMap.put("name", getUserName()); + pramsMap.put("taxRate", taxRate); pramsMap.put("loginName", getLoginName()); List taxList = getUserInfo().getOrg(); pramsMap.put("taxList", taxList); diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 07e4d05f..3bd8dbb1 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -1168,6 +1168,12 @@ and t.ele_invoice_no = #{eleInvoiceNo} + + and t.tax_rate = #{taxRate} + + + and t.tax_rate like '%,%' + order by t.qs_date desc,t.invoice_date desc