From c54fcacde80e90d9499446d0390c77c70d82c5b8 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 24 Feb 2021 17:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/result/WorkRecordTrendResultDTO.java      | 10 +++++-----
 .../impl/ScreenWorkRecordOrgDailyServiceImpl.java     | 11 ++++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordTrendResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordTrendResultDTO.java
index b456eb5326..eb5df34e99 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordTrendResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordTrendResultDTO.java
@@ -1,10 +1,10 @@
 package com.epmet.plugins.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -18,17 +18,17 @@ public class WorkRecordTrendResultDTO implements Serializable {
      * 横轴 过去十二个月份
      * ['1月', '2月', '3月', '4月', '5月','6月','7月','8月','9月','10月','11月','12月']
      */
-    private List<String> xAxis;
+    private List<String> xAxis = new ArrayList<>();
     /**
      * 资源标签名
      * ['三会一课', '主题党日', '三述专题', '志愿服务', '党内关怀']
      */
-    private List<String> legend;
+    private List<String> legend = new ArrayList<>();
 
     /**
      *各项资源对应数据对象
      */
-    private List<WorkRecordTrendResultDTO.SeriesResultDTO> series;
+    private List<WorkRecordTrendResultDTO.SeriesResultDTO> series = new ArrayList<>();
 
     @Data
     public static class SeriesResultDTO {
@@ -40,7 +40,7 @@ public class WorkRecordTrendResultDTO implements Serializable {
         /**
          * 各项资源对应12月份数据
          */
-        private List<Integer> data;
+        private List<Integer> data = new ArrayList<>();
         /**
          * 数据对应的月份Id
          */
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 635a03a5df..0d662c87e1 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
@@ -152,18 +152,19 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
     @DataSource(DataSourceConstant.STATS_DISPLAY)
     public WorkRecordTrendResultDTO trend(WorkRecordTrendFormDTO formDTO) {
         WorkRecordTrendResultDTO resultDTO = new WorkRecordTrendResultDTO();
-        //1.查询当前月过去12个月份
-        Map<String, String> map = dateUtils.getXpro();
-        resultDTO.setXAxis(map.values().stream().collect(Collectors.toList()));
-        List<String> monthIdList = map.keySet().stream().collect(Collectors.toList());
 
-        //2.根据资源编码查询资源名称集合，按sort升序
+        //1.根据资源编码查询资源名称集合，按sort升序
         List<String> legendList = screenCustomerWorkRecordDictDao.selectListByDataType(formDTO.getCustomerId(), formDTO.getDataType());
         resultDTO.setLegend(legendList);
         if (null == legendList || legendList.size() < NumConstant.ONE) {
             return resultDTO;
         }
 
+        //2.查询当前月过去12个月份
+        Map<String, String> map = dateUtils.getXpro();
+        resultDTO.setXAxis(map.values().stream().collect(Collectors.toList()));
+        List<String> monthIdList = map.keySet().stream().collect(Collectors.toList());
+
         //3-1.查询当前组织及所有下级过去12个月份某项数据所有资源的统计数据
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMM");
         LocalDate today = LocalDate.now();