From 1c8ed0e3e18d6ed97879cb2925db914a9d487314 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 17 六月 2021 14:47:03 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
index fa9b8e5..87c7c57 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -34,6 +34,8 @@
public static DateTimeFormatter format_ymd_String = DateTimeFormatter.ofPattern("yyMMdd");
+ public static SimpleDateFormat yyyyMM_format = new SimpleDateFormat("yyyy-MM");
+
/**
@@ -718,12 +720,31 @@
return date1.getTime();
}
+ public static Date parseDateYM(String str) {
+ try {
+ return yyyyMM_format.parse(str);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
public static int getMonth(Date date){
Calendar instance = Calendar.getInstance();
instance.setTime(date);
return instance.get(Calendar.MONTH);
}
+ public static boolean before(Date start, Date end){
+ Calendar date1 = Calendar.getInstance();
+ date1.setTime(start);
+ Calendar date2 = Calendar.getInstance();
+ date2.setTime(end);
+ return date1.before(date2);
+ }
+
+
public static void main(String[]args)throws Exception{
--
Gitblit v1.7.1