From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 78dcb97..acf070f 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
@@ -33,6 +33,8 @@
public static final String DATE_FORMATE_STRING_M = "yyyyMM";
public static final String DATE_FORMATE_STRING_N = "HHmmss";
public static final String DATE_FORMATE_STRING_O = "yyyyMMddHHmm";
+ public static final String DATE_FORMATE_STRING_Q = "yyyy-MM";
+
static {
@@ -52,6 +54,8 @@
formats.put("yyyyMM", new SimpleDateFormat("yyyyMM"));
formats.put("HHmmss", new SimpleDateFormat("HHmmss"));
formats.put("yyyyMMddHHmm", new SimpleDateFormat("yyyyMMddHHmm"));
+ formats.put("yyyy-MM", new SimpleDateFormat("yyyy-MM"));
+
}
@@ -722,7 +726,7 @@
* @return锛歭ist
*/
public static List<String> getMonthBetweenDate(String startTime, String endTime) {
- SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMATE_STRING_M);
+ SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMATE_STRING_Q);
// 澹版槑淇濆瓨鏃ユ湡闆嗗悎
List<String> list = new ArrayList<>();
try {
@@ -752,4 +756,16 @@
return list;
}
+ /**
+ * 闄ゅ幓 灏忔椂 鍒� 绉�
+ * @param time
+ * @return
+ */
+ public static Date timeToDate(Date time){
+ Calendar calendar =Calendar.getInstance();
+ calendar.setTime(time);
+ setTimeToMidnight(calendar);
+ return calendar.getTime();
+ }
+
}
--
Gitblit v1.8.0