From 15f6aadbad03b704ae37cf6d5841888486ee85c0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 十一月 2021 17:56:06 +0800
Subject: [PATCH] 优化报表
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 17e98b3..af61457 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -32,6 +32,7 @@
public static final String DATE_FORMATE_STRING_J = "yyyyMMddHHmmss.SSS";
public static final String DATE_FORMATE_STRING_K = "yyyyMMddHHmmssSSS";
public static final String DATE_FORMATE_STRING_L = "MMdd";
+ public static final String DATE_FORMATE_STRING_M = "yyyyMM";
static {
formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
@@ -47,6 +48,7 @@
formats.put("yyyyMMddHHmmss.SSS", new SimpleDateFormat("yyyyMMddHHmmss.SSS"));
formats.put("yyyyMMddHHmmssSSS", new SimpleDateFormat("yyyyMMddHHmmssSSS"));
formats.put("MMdd", new SimpleDateFormat("MMdd"));
+ formats.put("yyyyMM", new SimpleDateFormat("yyyyMM"));
}
@@ -350,14 +352,21 @@
public static Date getNextMonthFirstDate() {
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.DAY_OF_MONTH, 1);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
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();
+ Calendar curDateCal = Calendar.getInstance();
+ curDateCal.set(Calendar.DAY_OF_MONTH, 1);
+ curDateCal.set(Calendar.HOUR_OF_DAY, 0);
+ curDateCal.set(Calendar.MINUTE, 0);
+ curDateCal.set(Calendar.SECOND, 0);
+ Date curDate = curDateCal.getTime();
+ return curDate;
}
public static String getNextMonthFirstDay(String fmt) {
@@ -425,7 +434,7 @@
* 鍦ㄧ粰瀹氱殑鏃ユ湡鍔犱笂鎴栧噺鍘绘寚瀹氬ぉ鏁板悗鐨勬棩鏈�
*
* @param sourceDate 鍘熷鏃堕棿
- * @param day 瑕佽皟鏁寸殑鏈堜唤锛屽悜鍓嶄负璐熸暟锛屽悜鍚庝负姝ｆ暟
+ * @param day 瑕佽皟鏁寸殑鏈堜唤锛屽悜鍓嶄负璐熸暟锛屽悜鍚庝负姝ｆ暟
* @return
*/
public static Date stepDay(Date sourceDate, int day) {
--
Gitblit v1.8.0