From bdf6605a4fc448c659db0a75bccd7b026100b35e Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 30 May 2023 16:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/fpxxrz/BaseRzFpxxServiceImpl.java |  5 +++--
 .../BaseInvoiceManualCheckServiceImpl.java         | 14 +++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
index 2bb03762..2f8895be 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
@@ -63,7 +63,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
             json = tabulateRedisService.getTabulateMenu(company, menuId);
             // 合计信息,仅第一页时需要统计，减少数据库压力
             List<String> gfshList = (List<String>)pramsMap.get("gfsh");
-            log.info("购方税号{}",gfshList != null && !gfshList.isEmpty());
+//            log.info("购方税号{}",gfshList != null && !gfshList.isEmpty());
             List<Tax> taxList = (List<Tax>)pramsMap.get("taxList");
             List<String> orgList = new ArrayList<>();
             for (Tax t : taxList) {
@@ -156,7 +156,8 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                             && !"5".equals(pageList.get(i).getCxrzStatus())) {
                             pageList.get(i).setSelect(false);
                         }
-                        if (gfshList != null && !gfshList.isEmpty()){
+                        String sign = (String) pramsMap.get("sign");
+                        if (!"88".equals(sign)){
                             if (!gfshList1.contains(pageList.get(i).getGfsh())) {
                                 log.info("税号一申请抵扣");
                                 pageList.get(i).setSelect(false);
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 cd219b5b..d327a680 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
@@ -240,12 +240,16 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                         vo.setUpgradeStatus("0");
                     }
 
-                    if (!gfshList1.contains(pageList.get(i).getGfTaxNo()) && gfshList != null && gfshList.size() != 0) {
-                        vo.setSelect(false);
-                        vo.setBkgxts("该发票税号已申请抵扣统计");
-                        voList.add(vo);
-                        continue;
+                    String sign = (String) pramsMap.get("sign");
+                    if (!"88".equals(sign)){
+                        if (!gfshList1.contains(pageList.get(i).getGfTaxNo())) {
+                            vo.setSelect(false);
+                            vo.setBkgxts("该发票税号已申请抵扣统计");
+                            voList.add(vo);
+                            continue;
+                        }
                     }
+
                     if ("1".equals(qsflag) && !"1".equals(pageList.get(i).getQsStatus())) {
                         vo.setSelect(false);
                         vo.setBkgxts("该发票未签收");