From 33bfa1b3d03236922cc95b9435d7d10c91e8c4e5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 22 八月 2019 09:22:59 +0800
Subject: [PATCH] 明细
---
utils/src/main/java/org/yeshi/utils/DateUtil.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/DateUtil.java b/utils/src/main/java/org/yeshi/utils/DateUtil.java
index 49336da..592a8bb 100644
--- a/utils/src/main/java/org/yeshi/utils/DateUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/DateUtil.java
@@ -37,7 +37,7 @@
public static String dateDiff2(Date startTime, Date endTime) throws Exception {
- String datatime = 0 + "澶�" + 0 + "灏忔椂" + 0 + "鍒嗛挓";
+ String datatime = "0鍒嗛挓";
long nm = 1000 * 60;// 涓�鍒嗛挓鐨勬绉掓暟
long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
@@ -45,13 +45,19 @@
// 鑾峰緱涓や釜鏃堕棿鐨勬绉掓椂闂村樊寮�
long diff = endTime.getTime() - startTime.getTime();
-
long day = diff / nd;// 璁＄畻宸灏戝ぉ
long hour = diff % nd / nh;// 璁＄畻宸灏戝皬鏃�
long min = diff % nd % nh / nm;// 璁＄畻宸灏戝垎閽�
- datatime = day + "澶�" + hour + "灏忔椂" + min + "鍒嗛挓";
-
+ if (day > 0) {
+ datatime = day + "澶�" + hour + "鏃�" + min + "鍒�";
+ } else {
+ if (hour > 0 ) {
+ datatime = hour + "鏃�" + min + "鍒�";
+ } else {
+ datatime = min + "鍒�";
+ }
+ }
return datatime;
}
--
Gitblit v1.8.0