From d22fc97262aaa1813880a5b449bea79665f1d257 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 7 Apr 2021 17:50:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3--6=E3=80=81=E3=80=90?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97=E3=80=91=E6=94=AF=E9=83=A8?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E3=80=81=E8=81=94=E5=BB=BA=E5=85=B1=E5=BB=BA?=
 =?UTF-8?q?=E8=BF=9112=E6=9C=88=E8=B6=8B=E5=8A=BF=E5=9B=BE--=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=A8=AA=E5=9D=90=E6=A0=87=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E5=BD=93=E5=89=8D=E6=9C=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ScreenWorkRecordOrgDailyServiceImpl.java |  2 +-
 .../com/epmet/datareport/utils/DateUtils.java     | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
index c6d37bc8a3..74bba067cd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
@@ -205,7 +205,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         }
 
         //2.查询当前月过去12个月份
-        Map<String, String> map = dateUtils.getXpro();
+        Map<String, String> map = dateUtils.getXproSub();
         resultDTO.setXAxis(map.values().stream().collect(Collectors.toList()));
         List<String> monthIdList = map.keySet().stream().collect(Collectors.toList());
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java
index 62356ad9f5..bfc46d03bd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java
@@ -75,6 +75,21 @@ public class DateUtils {
         return result;
     }
 
+    public Map<String,String> getXproSub(){
+        Map<String,String> xAxis = new HashMap<>();
+        LocalDate today = LocalDate.now();
+
+        for(int i = NumConstant.TWELVE;i > NumConstant.ZERO; i--){
+            LocalDate localDate = today.minusMonths(i);
+            String s = localDate.getMonth().getValue() + "月";
+            xAxis.put(localDate.format(fmt),s);
+        }
+        Map<String, String> result = Maps.newLinkedHashMap();
+        xAxis.entrySet().stream().sorted(Map.Entry.comparingByKey())
+                .forEachOrdered((e -> result.put(e.getKey(),e.getValue())));
+        return result;
+    }
+
     public  Map<String,String> getXproEndMonth(String monthId){
         Map<String,String> xAxis = new HashMap<>();
         for(int i=NumConstant.ZERO;i <= NumConstant.ELEVEN; i++){