工作日志接口修改

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -210,12 +210,15 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         List<String> monthIdList = map.keySet().stream().collect(Collectors.toList());
 
         //3-1.查询当前组织及所有下级过去12个月份某项数据所有资源的统计数据
-        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMM");
-        LocalDate today = LocalDate.now();
-        formDTO.setStartMonth(today.minusMonths(NumConstant.THIRTEEN).format(fmt));
-        formDTO.setEndMonth(today.minusMonths(NumConstant.ONE).format(fmt));
+        formDTO.setStartMonth(monthIdList.get(NumConstant.ZERO));
+        formDTO.setEndMonth(monthIdList.get(NumConstant.ELEVEN));
         List<WorkRecordTrendResultDTO.SeriesResultDTO> list = screenWorkRecordOrgMonthlyDao.selectMonthList(formDTO);
 
+        /*log.info("legendList:"+ JSON.toJSONString(legendList,true));
+        log.info("xAxis:"+JSON.toJSONString(resultDTO.getXAxis(),true));
+        log.info("monthIdList:"+JSON.toJSONString(monthIdList,true));
+        log.info("startMonth:"+formDTO.getStartMonth()+";endMonth="+formDTO.getEndMonth());*/
+
         //3-2.遍历封装数据并返回
         LinkedList<WorkRecordTrendResultDTO.SeriesResultDTO> seriesList = new LinkedList<>();
         //按资源类型封装每一个资源类型对应的过去12个月的汇总数据,某个月份没有数据的补0