From 1215065e40d634a443cc13e54eefd2b10dcb3061 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 12:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
utils/src/main/java/org/yeshi/utils/DateUtil.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/DateUtil.java b/utils/src/main/java/org/yeshi/utils/DateUtil.java
index e8f4028..82ef3d4 100644
--- a/utils/src/main/java/org/yeshi/utils/DateUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/DateUtil.java
@@ -210,7 +210,34 @@
ca.add(Calendar.DATE, num);
return ca.getTime();
}
+
+ /**
+ * 鍔犱笂鏈堜唤
+ * @param currdate
+ * @param num
+ * @return
+ */
+ public static Date plusMonths(Date currdate, int num) {
+ Calendar ca = Calendar.getInstance();
+ ca.setTime(currdate);
+ ca.add(Calendar.MONTH, num);
+ return ca.getTime();
+ }
+
+ /**
+ * 鍔犱笂骞翠唤
+ * @param currdate
+ * @param num
+ * @return
+ */
+ public static Date plusYears(Date currdate, int num) {
+ Calendar ca = Calendar.getInstance();
+ ca.setTime(currdate);
+ ca.add(Calendar.YEAR, num);
+ return ca.getTime();
+ }
+
/**
* 鎸囧畾鏃ユ湡鍑忓幓澶╂暟鍚庣殑鏃ユ湡
*
@@ -395,9 +422,29 @@
int month = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * 12;
return Math.abs(month + result);
}
+
+
+ public static Date getTodayStartTime() {
+ Calendar todayStart = Calendar.getInstance();
+ todayStart.set(Calendar.HOUR_OF_DAY,0);
+ todayStart.set(Calendar.MINUTE,0);
+ todayStart.set(Calendar.SECOND,0);
+ todayStart.set(Calendar.MILLISECOND,0);
+ return todayStart.getTime();
+ }
+
+ public static Date getTodayEndTime() {
+ Calendar todayEnd = Calendar.getInstance();
+ todayEnd.set(Calendar.HOUR_OF_DAY,23);
+ todayEnd.set(Calendar.MINUTE,59);
+ todayEnd.set(Calendar.SECOND,59);
+ todayEnd.set(Calendar.MILLISECOND,999);
+ return todayEnd.getTime();
+ }
+
public static void main(String[] args) throws ParseException {
- System.out.println(getMonthSpace("2012-02", "2013-01"));
+ System.out.println(getMonthSpace("2012-02", "2012-02"));
}
}
\ No newline at end of file
--
Gitblit v1.8.0