From bb9e5b9a86bbd160ecb31f5c228ab54063a241bb Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 13 Jun 2023 15:19:59 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=8F=AA=E6=9C=89=E6=9C=89=E6=8A=A5?=
 =?UTF-8?q?=E8=B4=A6=E4=BF=A1=E6=81=AF=E7=9A=84=E5=8F=91=E7=A5=A8=E6=89=8D?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseRzTDxRecordInvoiceServiceImpl.java            | 11 +++++++++++
 .../src/main/resources/mapper/BaseSggxcxMapper.xml    |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
index c6477147..67f3d18f 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
@@ -249,14 +249,17 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
         StringBuilder sb1 = new StringBuilder();
         StringBuilder sb2 = new StringBuilder();
         StringBuilder sb3 = new StringBuilder();
+        StringBuilder sb4 = new StringBuilder();
         boolean flag = false;
         boolean flag1 = false;
         boolean flag2 = false;
         boolean flag3 = false;
+        boolean flag4 = false;//只有同步报账信息的发票才可以认证
         sb.append("以下发票号码的抵扣税额大于税额不可勾选认证： \n ");
         sb1.append("以下税号已被锁定不可勾选认证： \n ");
         sb2.append("以下税号已申请抵扣统计，请撤销统计后重新操作： \n ");
         sb3.append("以下税号本月发票可认证总税额超限：\n");
+        sb4.append("以下发票号码的报账信息没有同步：\n");
         List<String> taxList = new ArrayList<>();
         List<String> orgList = new ArrayList<>();
         List<String> dkList = new ArrayList<>();
@@ -267,6 +270,11 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
                 queryWrapper1.eq("uuid", uuidArray[i]);
                 DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
                 BaseTDxRecordInvoice recordInvoice = this.baseMapper.selectOne(queryWrapper1);
+                if(StringUtils.isEmpty(recordInvoice.getBzdh())){
+                    flag4 = true;
+                    sb4.append(recordInvoice.getUuid()).append(" \n ");
+                    continue;
+                }
                 Map<String, Object> curMap = new HashMap<>();
                 List<String> shList = new ArrayList<>();
                 shList.add(recordInvoice.getGfTaxNo());
@@ -390,6 +398,9 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
         if (flag3) {
             message = message + sb3.toString();
         }
+        if(flag4) {
+            message = message + sb4.toString();
+        }
         json.put("message", message);
         rzts = String.valueOf(cgsl);
         json.put("rzts", rzts);
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index cf4a629a..ac29d93b 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -509,6 +509,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test="bzdh == null or bzdh == '' or bzdh == 'null' or bzdh == '99'">
+            and t.bzdh is not null
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>