From a1bdc450eabe8d9a342dc4a578e157b73fdabf29 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期日, 08 十月 2023 11:41:27 +0800
Subject: [PATCH] 新版excel优化

---
 src/main/java/com/hx/util/DateUtil.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index f54bcda..2943ccd 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 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;
     }
 
     /**

--
Gitblit v1.8.0