From 901c322b2a42082843b690c13a00f8e7443365ed Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Wed, 12 May 2021 09:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9monthId=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/commons/tools/utils/DateUtils.java      | 11 +++++++++++
 .../service/impl/ScreenPublicDataServiceImpl.java     |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
index 408d53eb..b8b64bc6 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java
@@ -29,6 +29,9 @@ import java.util.Locale;
 public class DateUtils {
     /** 时间格式(yyyy-MM) */
     public final static String DATE_PATTERN_YEAR_MONTH = "yyyy-MM";
+
+    /** 时间格式(yyyy-MM) */
+    public final static String DATE_PATTERN_YEAR_MONTH2 = "yyyyMM";
 	/** 时间格式(yyyy-MM-dd) */
 	public final static String DATE_PATTERN = "yyyy-MM-dd";
 	/** 时间格式(yyyy-MM-dd HH:mm:ss) */
@@ -214,4 +217,12 @@ public class DateUtils {
     public static String formatYearMonth(Date date) {
         return format(date, DATE_PATTERN_YEAR_MONTH);
     }
+    /**
+     * 日期格式化 日期格式为：yyyy-MM
+     * @param date  日期
+     * @return  返回yyyy-MM格式日期
+     */
+    public static String formatYearMonth2(Date date) {
+        return format(date, DATE_PATTERN_YEAR_MONTH2);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java
index e17ebbe8..b92bf5fe 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java
@@ -146,7 +146,7 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl<ScreenPublicDat
     @Override
     public Result getOrgrankdata(String yearMonth) {
         // 如果统计月份为空，则统计上个月的数据
-        yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth;
+        yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth2(DateUtils.addDateMonths(new Date(),-1)) : yearMonth;
         List<OrgrankdataResultDTO> list = baseDao.getOrgrankdata(yearMonth);
         // 将list转换为json格式
         if(list != null && list.size()>0){
@@ -231,7 +231,7 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl<ScreenPublicDat
     @Override
     public Result getUserjoin(String yearMonth) {
         // 如果统计月份为空，则统计上个月的数据
-        yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth;
+        yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth2(DateUtils.addDateMonths(new Date(),-1)) : yearMonth;
         List<UserjoinResultDTO> list = baseDao.getUserjoin(yearMonth);
         // 将list转换为json格式
         if(list != null && list.size()>0) {
@@ -275,7 +275,7 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl<ScreenPublicDat
     @Override
     public Result getGovernrankdata(String yearMonth) {
         // 如果统计月份为空，则统计上个月的数据
-        yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth;
+        yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth2(DateUtils.addDateMonths(new Date(),-1)) : yearMonth;
         List<GovernrankdataResultDTO> list = baseDao.getGovernrankdata(yearMonth);
         // 将list转换为json格式
         if(list != null && list.size()>0){