From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
index f2b66aa..07ad57e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
@@ -220,4 +220,36 @@
String date = sdf.format(new Date(time));
return date;
}
+
+ /**
+ * 鑾峰彇涓や釜鏃堕棿鐨勫ぉ鏁板樊鍊�
+ *
+ * @param from
+ * @param to
+ * @return
+ */
+ public static int getDayDifferenceCount(Date from, Date to) {
+ Calendar cal1 = Calendar.getInstance();
+ cal1.setTime(from);
+ Calendar cal2 = Calendar.getInstance();
+ cal2.setTime(to);
+ int day1 = cal1.get(Calendar.DAY_OF_YEAR);
+ int day2 = cal2.get(Calendar.DAY_OF_YEAR);
+ int year1 = cal1.get(Calendar.YEAR);
+ int year2 = cal2.get(Calendar.YEAR);
+ if (year1 != year2) { // 鍚屼竴骞�
+ int timeDistance = 0;
+ for (int i = year1; i < year2; i++) {
+ if (i % 4 == 0 && i % 100 != 0 || i % 400 == 0) { // 闂板勾
+ timeDistance += 366;
+ } else { // 涓嶆槸闂板勾
+ timeDistance += 365;
+ }
+ }
+ return timeDistance + (day2 - day1);
+ } else { // 涓嶅悓骞�
+ return day2 - day1;
+ }
+
+ }
}
--
Gitblit v1.8.0