From 70fe0b1d57adeb7da6f08fee888f938dae33bad9 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 31 May 2023 21:44:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E8=83=BD=E5=8B=BE=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java | 6 ++----
 1 file changed, 2 insertions(+), 4 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 2f8895be..b230fa47 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
@@ -72,6 +72,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                     orgList.add(t.getTaxno());
                 }
             }
+            log.info("orgList======>{}",orgList);
 
             if (gfshList.size() == 0) {
                 // 未从getUserInfo()获取到购方税号信息
@@ -124,10 +125,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                     for (int i = 0; i < pageList.size(); i++) {
                         pageList.get(i).setSelect(false);
                         String taxno = pageList.get(i).getGfsh();
-//                        if (orgList.contains(taxno) && "1".equals(pageList.get(i).getRzzt())) {
-//                            pageList.get(i).setSelect(true);
-//                        }
-                        if ("0".equals(pageList.get(i).getRzzt())) {
+                        if (orgList.contains(taxno) && "1".equals(pageList.get(i).getRzzt())) {
                             pageList.get(i).setSelect(true);
                         }
                         String skssq = pageList.get(i).getSkssq();

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

---
 .../com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java   | 4 ++++
 1 file changed, 4 insertions(+)

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 b230fa47..eaacf6a4 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
@@ -127,6 +127,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         String taxno = pageList.get(i).getGfsh();
                         if (orgList.contains(taxno) && "1".equals(pageList.get(i).getRzzt())) {
                             pageList.get(i).setSelect(true);
+                            log.info("rzzt和orgList设置成true");
                         }
                         String skssq = pageList.get(i).getSkssq();
                         QueryWrapper<BaseTDxTaxCurrent> queryWrapper = new QueryWrapper<>();
@@ -136,6 +137,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                             if (!taxCurrent.getCurrentTaxPeriod().equals(skssq)
                                 || !"1".equals(pageList.get(i).getRzzt())) {
                                 pageList.get(i).setSelect(false);
+                                log.info("skssq设置为false");
                             }
                         }
 
@@ -153,6 +155,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         if (!"0".equals(pageList.get(i).getCxrzStatus())
                             && !"5".equals(pageList.get(i).getCxrzStatus())) {
                             pageList.get(i).setSelect(false);
+                            log.info("撤销认证状态设置false");
                         }
                         String sign = (String) pramsMap.get("sign");
                         if (!"88".equals(sign)){
@@ -164,6 +167,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
 
                         if ("1".equals(pageList.get(i).getOutStatus()) || "2".equals(pageList.get(i).getOutStatus())) {
                             pageList.get(i).setSelect(false);
+                            log.info("转出状态设置false");
                         }
 
                         // 字典转换

From a0929550a7844c578f7c71b8c12a7ebb4366b2b4 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 1 Jun 2023 08:17:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/base/controller/BaseInvoiceController.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index cc819f60..3767281e 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -874,11 +874,11 @@ public class BaseInvoiceController extends AbstractController {
         String menuId = (String)map.get("menuId");
         String company = (String)map.get("company");
 
-        if (StringUtils.isNotBlank(inAccountStatus)){
+        if (StringUtils.isBlank(inAccountStatus)){
             return ResponseEntity.ok(R.error("入账状态不能为空"));
         }
 
-        if (StringUtils.isNotBlank(maxTax)){
+        if (StringUtils.isBlank(maxTax)){
             return ResponseEntity.ok(R.error("税额上限不能为空"));
         }