From a1f68ded9fbe4214bcd809abcf48dee8a8154ac3 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 4 Nov 2024 09:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9E=8D=E9=92=A2=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=92=8C=E6=9D=90=E6=96=99=E5=85=A5=E5=9C=BA?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4NaN-NaN-NaN=20NaN:NaN:NaN=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhgd/xmgl/modules/car/controller/CarInfoController.java | 6 +++++-
 .../xmgl/modules/xz/controller/XzMaterialController.java    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
index c620bd17c..f66aff899 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
@@ -147,7 +147,11 @@ public class CarInfoController {
             carInfo.setCarModuleType(carModuleType);
             Integer entryAndExitPermit = "单次".equals(MapUtils.getString(map, "entryAndExitPermit")) ? 0 : 1;
             carInfo.setReserveStartTime(DateUtil.parse(map.get("reserveStartTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT));
-            carInfo.setReserveEndTime(DateUtil.parse(map.get("reserveEndTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT));
+            try {
+                carInfo.setReserveEndTime(DateUtil.parse(map.get("reserveEndTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT));
+            } catch (Exception e) {
+                carInfo.setReserveEndTime(DateUtil.offsetDay(carInfo.getReserveStartTime(), 3));
+            }
             carInfo.setEntryAndExitPermit(entryAndExitPermit);
             carInfo.setCarNumber(String.valueOf(map.get("carNumber")));
             Object carColor = map.get("carColor");
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
index abe1b8320..c10376957 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
@@ -191,7 +191,11 @@ public class XzMaterialController {
                 xzMaterial.setNum(index);
             }
             xzMaterial.setEntryBeginTime(DateUtil.parse(obj.getString("startTime") + ":00", DatePattern.NORM_DATETIME_FORMAT));
-            xzMaterial.setEntryEndTime(DateUtil.parse(obj.getString("endTime") + ":00", DatePattern.NORM_DATETIME_FORMAT));
+            try {
+                xzMaterial.setEntryEndTime(DateUtil.parse(obj.getString("endTime") + ":00", DatePattern.NORM_DATETIME_FORMAT));
+            } catch (Exception e) {
+                xzMaterial.setEntryEndTime(DateUtil.offsetDay(xzMaterial.getEntryBeginTime(), 3));
+            }
             xzMaterial.setCarNumber(obj.getString("carNumber"));
             JSONArray detail = obj.getJSONArray("detail");
             if (detail != null) {