From c3402e1f3d36f89fc60a0482f21b58aec4cd1de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Wed, 6 Dec 2023 18:02:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseInvoiceController.java     |  2 +-
 .../dxhy/core/thread/RzFpxxExportThread.java  | 28 +++++++++++--------
 .../src/main/resources/mapper/FpZhMapper.xml  |  2 +-
 3 files changed, 18 insertions(+), 14 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 7e453848..6df3110f 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
@@ -337,7 +337,7 @@ public class BaseInvoiceController extends AbstractController {
             return ResponseEntity.ok(R.error("开票开始日期不能为空！"));
         }
         if (!StringHelper.isBlank(kpjsrq)) {
-            String night = DateUtils.getMorning(DateUtils.strToDate(kpjsrq));
+            String night = DateUtils.getNight(DateUtils.strToDate(kpjsrq));
             pramsMap.put("kpjsrq", night);
         } else {
             return ResponseEntity.ok(R.error("开票结束日期不能为空！"));
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
index 54e24317..8b81d195 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
@@ -8,6 +8,7 @@ import com.dxhy.common.util.ExcelPoiUtil;
 import com.dxhy.common.util.ExceptionUtil;
 import com.dxhy.common.util.StringHelper;
 import com.dxhy.common.utils.DateUtils;
+import com.dxhy.common.utils.R;
 import com.dxhy.common.vo.Business;
 import com.dxhy.core.entity.TDxExcelExportlog;
 import com.dxhy.core.feign.IFeginWebsocket;
@@ -19,6 +20,7 @@ import com.dxhy.core.util.JsonResponseUtils;
 import com.dxhy.oss.service.FileService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
 
 import java.util.*;
 
@@ -217,24 +219,26 @@ public class RzFpxxExportThread extends BaseThread {
                 } else {
                     pramsMap.put("qszt", "");
                 }
-                if (!"99".equals(rzzt) && StringUtils.isNotBlank(rzzt)) {
-                    pramsMap.put("rzzt", rzzt);
-                    if ("1".equals(rzzt) || "2".equals(rzzt)) {
-                        if (StringUtils.isNotBlank(rzksrq)) {
-                            String morning = DateUtils.getMorning(DateUtils.strToDate(rzksrq));
-                            pramsMap.put("rzksrq", morning);
+                if (!StringHelper.isBlank(rzzt)) {
+                    // 已认证传 认证起止日期和税款所属期做判断
+                    if (!"99".equals(rzzt)) {
+                        pramsMap.put("rzzt", rzzt);
+                    }
+                    if (!"0".equals(rzzt)) {
+                        if (!StringHelper.isBlank(rzksrq)) {
+                            rzksrq = DateUtils.getMorning(DateUtils.strToDate(rzksrq));
+                            pramsMap.put("rzksrq", rzksrq);
                         }
-                        if (StringUtils.isNotBlank(rzjsrq)) {
-                            String night = DateUtils.getMorning(DateUtils.strToDate(rzjsrq));
-                            pramsMap.put("rzjsrq", night);
+                        if (!StringHelper.isBlank(rzjsrq)) {
+                            rzjsrq = DateUtils.getNight(DateUtils.strToDate(rzjsrq));
+                            pramsMap.put("rzjsrq", rzjsrq);
                         }
-                        if (StringUtils.isNotBlank(skssq)) {
+                        if (!StringHelper.isBlank(skssq)) {
                             pramsMap.put("skssq", skssq);
                         }
                     }
-                } else {
-                    pramsMap.put("rzzt", "");
                 }
+
                 if (StringUtils.isNotBlank(invoiceStatus) && !"99".equals(invoiceStatus)) {
                     pramsMap.put("invoiceStatus", invoiceStatus);
                 }
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 1248423f..70019182 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -108,7 +108,7 @@
         and t.invoice_type in ('01','03','08','14','31','283','161','183','185')
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
-        and t.auth_status in ('2','3','4')
+        and t.auth_status in ('0','2','3','4','5','6')
         and t.company = #{company}
         and t.gf_tax_no = #{gfsh}
         and t.comp_code = #{companyCode}