From 55334da20cff4dac840c320eda1d0ca53ba27eda Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 23 九月 2024 14:26:36 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-xlk

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

diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index 33b8d66..1ae3c6b 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -1,5 +1,7 @@
 package com.hx.util;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -452,6 +454,25 @@
     }
 
     /**
+     * 鑾峰彇涓や釜鏃堕棿鐩稿樊鍒嗛挓鏁�
+     * @param startTime 寮�濮嬫椂闂�
+     * @param endTime 缁撴潫鏃堕棿
+     * @param remainder 浣欐暟杩�1
+     * @return 鍒嗛挓
+     */
+    public static int differMinute(Date startTime, Date endTime,boolean remainder) {
+        BigDecimal sTime = new BigDecimal(startTime.getTime());
+        BigDecimal eTime = new BigDecimal(endTime.getTime());
+        eTime = eTime.subtract(sTime).setScale(0,RoundingMode.HALF_UP);
+        if(remainder){
+            eTime = eTime.divide(BigDecimal.valueOf(60000.0)).setScale(0, RoundingMode.UP);
+        }else{
+            eTime = eTime.divide(BigDecimal.valueOf(60000.0)).setScale(0, RoundingMode.DOWN);
+        }
+        return eTime.intValue();
+    }
+
+    /**
      * endTime姣攕tartTime澶氱殑澶╂暟
      * @param startTime 鏈�灏忔椂闂�
      * @param endTime 鏈�澶ф椂闂�

--
Gitblit v1.8.0