From 3d7a4912e2408f1dd06a82d99f255ae15650180b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 16 十月 2020 15:20:37 +0800
Subject: [PATCH] 优化加入报表基础生成表
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index 3d6bc65..e431476 100644
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -347,16 +347,22 @@
return returndate;
}
+ public static Date getNextMonthFirstDate() {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ calendar.add(Calendar.MONTH, 1);
+ return calendar.getTime();
+ }
+
+ public static Date getFirstDate() {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ return calendar.getTime();
+ }
+
public static String getNextMonthFirstDay(String fmt) {
String returndate = "";
- Date date = null;
-
- Calendar cl = Calendar.getInstance();
- cl.set(2, cl.get(2) + 1);
- cl.set(5, 1);
-
- date = cl.getTime();
-
+ Date date = getNextMonthFirstDate();
returndate = getFormatTimeString(date, fmt);
return returndate;
@@ -426,4 +432,42 @@
return dateStr;
}
+
+ public static int getYear() {
+ Date date = getCurrentDate();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ return calendar.get(Calendar.YEAR);
+ }
+
+ public static int getMonth() {
+ Date date = getCurrentDate();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ return calendar.get(Calendar.MONTH) + 1;
+ }
+
+ /**
+ * 鍒ゆ柇鏃堕棿鏄惁鍦ㄦ椂闂存鍐�
+ *
+ * @param nowTime
+ * @param beginTime
+ * @param endTime
+ * @return
+ */
+ public static boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
+ Calendar date = Calendar.getInstance();
+ date.setTime(nowTime);
+ Calendar begin = Calendar.getInstance();
+ begin.setTime(beginTime);
+ Calendar end = Calendar.getInstance();
+ end.setTime(endTime);
+ if (date.after(begin) && date.before(end)) {
+ return true;
+ } else if (nowTime.compareTo(beginTime) == 0 || nowTime.compareTo(endTime) == 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
}
--
Gitblit v1.8.0