From acd9ef02659351ced3d34423dd94618044d129e8 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Fri, 19 May 2023 11:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=99=BA=E8=83=BD=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java       | 4 +++-
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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<BaseTDx
                         if (collect != null && collect.size() > 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<BaseTDx
         return super.responseResult(json);
     }
 
-    @NotNull
     public BaseSggxCxRespVO getBaseSggxCxRespVO(BaseTDxRecordInvoice baseTDxRecordInvoice, int count, List<String> taxnoList, List<Business> 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
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}