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 beeb0c26..085d02c9 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 @@ -227,9 +227,9 @@ public class BaseInvoiceController extends AbstractController { } if (!StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){ - List rates = new ArrayList<>(); - rates = convertRates(taxRate,rates); - pramsMap.put("taxRate",rates); +// List rates = new ArrayList<>(); +// rates = convertRates(taxRate,rates); + pramsMap.put("taxRate",taxRate); } if (!StringHelper.isBlank(invoiceType)) { @@ -576,9 +576,9 @@ public class BaseInvoiceController extends AbstractController { } if (!StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){ - List rates = new ArrayList<>(); - rates = convertRates(taxRate,rates); - pramsMap.put("taxRate",rates); +// List rates = new ArrayList<>(); +// rates = convertRates(taxRate,rates); + pramsMap.put("taxRate",taxRate); } List gfshList = new ArrayList<>(); if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) { diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 312ac7bb..88f3c498 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -241,7 +241,6 @@ #{taxRate} - order by t.rzh_date desc,t.invoice_date desc