From ea8dce697c0d53096b090c2f13c5a8c6ee0a24e0 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 12 May 2021 10:30:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E5=87=A0=E4=B8=AA=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E6=8E=A8=E9=80=81=E5=A4=A7=E5=B1=8F=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/commons/tools/utils/DateUtils.java   | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
index 480ad5d..301538b 100644
--- a/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
+++ b/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
@@ -28,17 +28,23 @@ import java.util.Locale;
  */
 public class DateUtils {
 
+    /** 时间格式(yyyy-MM) */
+    public final static String DATE_PATTERN_YEAR_MONTH = "yyyy-MM";
+
 	/** 时间格式(yyyy-MM-dd) */
 	public final static String DATE_PATTERN = "yyyy-MM-dd";
 
 	/** 时间格式(yyyy-MM-dd HH:mm:ss) */
 	public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
 
-    /** 时间格式(yyyyMMddHHmmss) */
-	public final static String DATE_TIME_NO_SPLIT  = "yyyyMMddHHmmss";
+    /** 时间格式(yyyyMM) */
+    public final static String DATE_PATTERN_YEAR_MONTH_NO_SPLIT = "yyyyMM";
 
-    /** 时间格式(yyyy-MM) */
-    public final static String DATE_PATTERN_YEAR_MONTH = "yyyy-MM";
+    /** 时间格式(yyyyMMdd) */
+    public final static String DATE_PATTERN_NO_SPLIT = "yyyyMMdd";
+
+    /** 时间格式(yyyyMMddHHmmss) */
+    public final static String DATE_TIME_NO_SPLIT  = "yyyyMMddHHmmss";
 
     /**
      * 日期格式化 日期格式为：yyyy-MM
@@ -49,6 +55,15 @@ public class DateUtils {
         return format(date, DATE_PATTERN_YEAR_MONTH);
     }
 
+    /**
+     * 日期格式化 日期格式为：yyyyMM
+     * @param date  日期
+     * @return  返回yyyyMM格式日期
+     */
+    public static String formatYearMonthNoSplit(Date date) {
+        return format(date, DATE_PATTERN_YEAR_MONTH_NO_SPLIT);
+    }
+
     /**
      * 日期格式化 日期格式为：yyyy-MM-dd
      * @param date  日期