diff --git a/physical-base-core/src/main/java/org/jeecg/common/util/DateUtils.java b/physical-base-core/src/main/java/org/jeecg/common/util/DateUtils.java index f84d6b6..448b625 100644 --- a/physical-base-core/src/main/java/org/jeecg/common/util/DateUtils.java +++ b/physical-base-core/src/main/java/org/jeecg/common/util/DateUtils.java @@ -701,6 +701,14 @@ public class DateUtils extends PropertyEditorSupport { return null; } + public static Date parseDatetimeShort(String str) { + try { + return time_sdf.get().parse(str); + } catch (Exception e) { + } + return null; + } + /** * 判断两个时间是否是同一天 * diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java index 04e3762..380ba28 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java @@ -87,7 +87,7 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl value.forEach(v1 -> { String startTime = v1.get("startTime"); String endTime = v1.get("endTime"); - list.add(new TimeRange(DateUtils.parseDatetime(startTime), DateUtils.parseDatetime(endTime))); + list.add(new TimeRange(DateUtils.parseDatetimeShort(startTime), DateUtils.parseDatetimeShort(endTime))); })); } }