From d9fe4b6ff40a964c895a452ea12a04a13a979ec4 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 04 十二月 2023 18:26:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/hx/util/DateUtil.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index f54bcda..29b40d0 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -816,16 +816,19 @@
/**
* 鑾峰彇鏌愬ぉ缁撴潫绉掓暟
- * @param startTime
+ * @param dateTime 鏃ユ湡
+ * @param lateSecond 寤惰繜绉掓暟
* @return
*/
- public long todayEndSecond(Date startTime) {
- if(startTime == null){
- startTime = new Date();
+ public static long todayEndSecond(Date dateTime, Long lateSecond) {
+ if(dateTime == null){
+ dateTime = new Date();
}
- Date endTime = DateUtil.dayToEndDate(startTime);
- //澶氬姞10绉�
- return differSecond(startTime, endTime) + 10L;
+ if(lateSecond == null){
+ lateSecond = 0L;
+ }
+ Date endTime = DateUtil.dayToEndDate(dateTime);
+ return differSecond(dateTime, endTime) + lateSecond;
}
/**
@@ -834,7 +837,7 @@
* @param endTime 缁撴潫鏃堕棿
* @return
*/
- public long differSecond(Date startTime, Date endTime) {
+ public static long differSecond(Date startTime, Date endTime) {
if(startTime == null || endTime == null){
return 0L;
}
--
Gitblit v1.8.0