From 5ca9bd6876a376c1c2fc4cdc2cf9bbcf7d4684bc Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 17 三月 2023 14:11:24 +0800
Subject: [PATCH] !673 $tab.closePage后存在非首页页签时不应该跳转首页 Merge pull request !673 from Giovanni/master
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index a2cb78d..04c87d8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -145,16 +145,20 @@
}
/**
- * 计算两个时间差
+ * 计算时间差
+ *
+ * @param endTime 最后时间
+ * @param startTime 开始时间
+ * @return 时间差（天/小时/分钟）
*/
- public static String getDatePoor(Date endDate, Date nowDate)
+ public static String timeDistance(Date endDate, Date startTime)
{
long nd = 1000 * 24 * 60 * 60;
long nh = 1000 * 60 * 60;
long nm = 1000 * 60;
// long ns = 1000;
// 获得两个时间的毫秒时间差异
- long diff = endDate.getTime() - nowDate.getTime();
+ long diff = endDate.getTime() - startTime.getTime();
// 计算差多少天
long day = diff / nd;
// 计算差多少小时
--
Gitblit v1.9.2