From 32ea2fa583a9844a7fe781b20aab44f9769eb7de Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 10 Aug 2023 10:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/fpxxrz/BaseRzFpxxServiceImpl.java | 17 ++++++++-------
 .../BaseInvoiceManualCheckServiceImpl.java    | 21 +++++++++++--------
 .../BaseFpbrzServiceImpl.java                 |  4 +++-
 3 files changed, 25 insertions(+), 17 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 ae60eeeb..a0c340c1 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
@@ -20,12 +20,14 @@ import com.dxhy.common.vo.Tax;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -104,7 +106,9 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                 log.info("认证查询-查询首页合计信息耗时:{}",System.currentTimeMillis()-enter);
 
                 List<String> gfshList1 = new ArrayList<>();
-                List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh(pramsMap);
+                Map<String,Object> map = new HashMap<>();
+                map.put("gfsh",new ArrayList<>().add(gfsh));
+                List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh(map);
                 log.info("认证查询列表-返回的所属期列表为:{}",curList);
                 for (BaseTDxDkCount cur : curList) {
                     String skssq = cur.getSkssq();
@@ -161,14 +165,13 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                             pageList.get(i).setSelect(false);
                             log.info("撤销认证状态设置false");
                         }
-                        String sign = (String) pramsMap.get("sign");
-                        if (!"88".equals(sign)){
-                            if (!gfshList1.contains(pageList.get(i).getGfsh())) {
-                                log.info("税号一申请抵扣");
-                                pageList.get(i).setSelect(false);
-                            }
+
+                        if (!gfshList1.contains(pageList.get(i).getGfsh())) {
+                            log.info("税号一申请抵扣");
+                            pageList.get(i).setSelect(false);
                         }
 
+
                         if ("1".equals(pageList.get(i).getOutStatus()) || "2".equals(pageList.get(i).getOutStatus())) {
                             pageList.get(i).setSelect(false);
                             log.info("转出状态设置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 e392ad82..c54542e6 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
@@ -13,6 +13,7 @@ import com.dxhy.base.dao.SysDeptAuthDao;
 import com.dxhy.base.entity.SysDeptEntity;
 import com.dxhy.common.constant.DictConstant;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -79,7 +80,9 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
             String qsflag = (String) pramsMap.get("qsflag");
             List<String> gfshList1 = new ArrayList<>();
             if (StringUtils.isNotBlank(gfsh)) {
-                List<BaseTDxDkCount> curList = super.baseMapper.selectDksh(pramsMap);
+                Map<String,Object> map = new HashMap<>();
+                map.put("gfsh",new ArrayList<>().add(gfsh));
+                List<BaseTDxDkCount> curList = super.baseMapper.selectDksh(map);
                 for (BaseTDxDkCount cur : curList) {
                     String skssq = cur.getSkssq();
                     String year = skssq.substring(0, 4);
@@ -243,19 +246,19 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                             || pageList.get(i).getInvoiceAmount() != null && pageList.get(i).getInvoiceAmount().compareTo(new BigDecimal(0)) < 0
                             || pageList.get(i).getTaxAmount() != null && pageList.get(i).getTaxAmount().compareTo(new BigDecimal(0)) < 0) {
                         vo.setSelect(false);
+                        vo.setBkgxts("该发票状态为"+pageList.get(i).getInvoiceStatus());
                         vo.setUpgradeStatus("0");
                     }
 
-                    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 (!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("该发票未签收");
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java
index 25296806..14e99ae2 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java
@@ -79,7 +79,9 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl<BaseFpbrzDao, BaseTD
             return super.responseResult(json);
         }
 
-        List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh(pramsMap);
+        Map<String,Object> map = new HashMap<>();
+        map.put("gfsh",new ArrayList<String>().add(taxno));
+        List<BaseTDxDkCount> curList = baseTDxRecordInvoiceDao.selectDksh(map);
         List<String> gfshList = new ArrayList<>();
         for (BaseTDxDkCount cur : curList) {
             String skssq = cur.getSkssq();