From 9293058870817fceab8ec3cc5c4cf2d4f06780e2 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Fri, 19 May 2023 11:05:42 +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 | 5 ++++- dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) 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 862485ff..ac75d98a 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 @@ -497,6 +497,9 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl"+maxTax+",currentTax====>"+currentTax); @@ -537,7 +540,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl collect = pageList.stream().skip(i + 1).sorted(Comparator.comparing(BaseTDxRecordInvoice::getTaxAmount)).collect(Collectors.toList()); + List collect = pageList.stream().skip(i + 1).filter(e->e.getTaxAmount().compareTo(new BigDecimal("0"))<1).sorted(Comparator.comparing(BaseTDxRecordInvoice::getTaxAmount)).collect(Collectors.toList()); if (collect != null && collect.size() > 0){ log.info("从小到大排序在进行添加"); for (int j = 0; j < collect.size(); j++) { diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index af02ecb9..1dbbcdb7 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -1284,6 +1284,7 @@ and t.auth_status in('0','5','6') and t.export_mark = '0' and t.company = #{company} + and t.invoice_status = '0' and t.gf_tax_no in