From 947bbb8cbd35d0481071c7f2cebdcf7495ac112b Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 8 May 2023 17:08:47 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=97=A5=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseTDxTaxCurrentServiceImpl.java         | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java
index 249887eb..b5fc2b2e 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java
@@ -74,15 +74,25 @@ public class BaseTDxTaxCurrentServiceImpl extends MpBaseServiceImpl<BaseTDxTaxCu
             String selectStartDate = current.getSelectStartDate();
             String selectEndDate = current.getSelectEndDate();
             String operationEndDate = current.getOperationEndDate();
-            selectStartDate = LocalDate.parse(selectStartDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
-                .format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
-            selectEndDate = LocalDate.parse(selectEndDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
-                .format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
-            operationEndDate = LocalDate.parse(operationEndDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
-                .format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
+            if (StringUtils.isNotBlank(selectStartDate)){
+                selectStartDate = LocalDate.parse(selectStartDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
+                        .format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
+            }
+
+            if (StringUtils.isNotBlank(selectEndDate)){
+                selectEndDate = LocalDate.parse(selectEndDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
+                        .format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
+            }
+
+            if (StringUtils.isNotBlank(operationEndDate)){
+                operationEndDate = LocalDate.parse(operationEndDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
+                        .format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
+            }
             current.setSelectStartDate(selectStartDate);
             current.setSelectEndDate(selectEndDate);
             current.setOperationEndDate(operationEndDate);
+
+
         }
         JSONObject json = new JSONObject();
         json.put("current", current);