From bdd0875d4b13a3f1ef472f64d4b6a95e0ef64b22 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期六, 19 八月 2023 10:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/develop'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
index b3fbdc4..75c7f8e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
@@ -75,10 +75,11 @@
}
/**
- * @return 鑾峰彇涓や釜date鐨勬椂闂村樊锛岀粨鏋滀负绉�
+ * @return 鑾峰彇涓や釜date鐨勬椂闂村樊锛岀粨鏋滀负绉� 闄�
*/
public static long differentSecond(Date startDate, Date endDate) {
- return (endDate.getTime() - startDate.getTime()) / 1000;
+ return new BigDecimal(endDate.getTime() - startDate.getTime()).divide(new BigDecimal("1000"), 0, BigDecimal.ROUND_HALF_UP).longValue();
+// return (endDate.getTime() - startDate.getTime()) / 1000;
}
/**
--
Gitblit v1.9.3