From 1ff2f63ddc05988ed7d698ef93a905659365446f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 10 九月 2025 14:52:57 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/intelligent_manufacture_wuhu
---
serverWuhu/src/main/java/com/doumee/core/utils/Date.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/serverWuhu/src/main/java/com/doumee/core/utils/Date.java b/serverWuhu/src/main/java/com/doumee/core/utils/Date.java
index 73310aa..68d5160 100644
--- a/serverWuhu/src/main/java/com/doumee/core/utils/Date.java
+++ b/serverWuhu/src/main/java/com/doumee/core/utils/Date.java
@@ -2,6 +2,7 @@
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
+import java.util.Objects;
/**
* 鏃ユ湡宸ュ叿
@@ -20,6 +21,9 @@
* @return java.util.Date
*/
public java.util.Date getStart (java.util.Date date) {
+ if(Objects.isNull(date)){
+ return null;
+ }
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.set(Calendar.HOUR_OF_DAY, 0);
@@ -36,6 +40,9 @@
* @return java.util.Date
*/
public java.util.Date getEnd (java.util.Date date) {
+ if(Objects.isNull(date)){
+ return null;
+ }
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) + 1);
--
Gitblit v1.9.3