From 969d3507163720cd59e5c78e3e0a7e0bdb47c366 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 24 十月 2023 09:09:25 +0800
Subject: [PATCH] 企业端
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index 88f215a..1baf3ea 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -299,7 +299,7 @@
nowDate = sdfShort.format(date);
return nowDate;
} catch (Exception e) {
- throw e;
+ return null;
}
}
@@ -3011,10 +3011,13 @@
* @return
*/
public static Integer betweenMin(Date begin, Date end) {
+ if(begin ==null ){
+ return 0;
+ }
long createTime =begin.getTime();//鑾峰彇鍒涘缓鏃堕棿鐨勬椂闂存埑
long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//鑾峰彇褰撳墠鏃堕棿鐨勬椂闂存埑
long diff=(currentTime-createTime)/1000/60;//鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勫垎閽�
- return (int)diff;
+ return (int)diff + 1 ;
}
--
Gitblit v1.9.3