diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index ac75d98a..4fbb0ef5 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -544,6 +544,9 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl 0){ log.info("从小到大排序在进行添加"); for (int j = 0; j < collect.size(); j++) { + if (collect.get(j).getTaxAmount().compareTo(new BigDecimal("0"))<1){ + continue; + } currentTax = currentTax.add(collect.get(j).getTaxAmount()); hjje = hjje.add(collect.get(j).getInvoiceAmount()); log.info("maxTax====>"+maxTax+",currentTax====>"+currentTax); @@ -605,7 +608,6 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl taxnoList, List businessList) { BaseSggxCxRespVO vo = new BaseSggxCxRespVO(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 1dbbcdb7..994a9e0f 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -1285,7 +1285,7 @@ and t.export_mark = '0' and t.company = #{company} and t.invoice_status = '0' - + and t.tax_amount > 0 and t.gf_tax_no in #{item}