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) {