Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/form/VoluntaryServiceTrendFormDTO.java

@@ -18,7 +18,7 @@ public class VoluntaryServiceTrendFormDTO {
     @NotBlank(message = "agencyId不能为空")
     private String agencyId;
 
-    @NotBlank(message = "目前只有平阴在传，默认赋值：370124")
+    // @NotBlank(message = "目前只有平阴在传，默认赋值：370124")
     private String areaCode;
 
     @NotBlank(message = "customerId不能为空")

epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/form/WorkRecordRankFormDTO.java

@@ -36,6 +36,6 @@ public class WorkRecordRankFormDTO implements Serializable {
     @NotBlank(message = "customerId不能为空")
     private String customerId;
 
-    @NotBlank(message = "areaCode不能为空,目前只有平阴在传，默认赋值：370124")
+    // @NotBlank(message = "areaCode不能为空,目前只有平阴在传，默认赋值：370124")
     private String areaCode;
 }

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

@@ -205,17 +205,20 @@ 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());
 
         //3-1.查询当前组织及所有下级过去12个月份某项数据所有资源的统计数据
-        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMM");
+        formDTO.setStartMonth(monthIdList.get(NumConstant.ZERO));
-        LocalDate today = LocalDate.now();
+        formDTO.setEndMonth(monthIdList.get(NumConstant.ELEVEN));
-        formDTO.setStartMonth(today.minusMonths(NumConstant.THIRTEEN).format(fmt));
-        formDTO.setEndMonth(today.minusMonths(NumConstant.ONE).format(fmt));
         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
@@ -253,8 +256,9 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
     public VoluntaryServiceTrendResultDTO voluntaryServiceTrend(VoluntaryServiceTrendFormDTO formDTO) {
         VoluntaryServiceTrendResultDTO resultDTO = new VoluntaryServiceTrendResultDTO();
         //近12个月的monthId集合,["202002","202003","202004","202005","202006","202007","202008","202009","202010","202011","202012","202101"]
+        //截止到上个月
         List<String> monthIdList = com.epmet.commons.tools.utils.DateUtils.getMonthIdList(formDTO.getEndMonthId(), NumConstant.ELEVEN);
-        // log.info(JSON.toJSONString(monthIdList));
+        log.info(JSON.toJSONString(monthIdList));
 
         AgencyInfoDTO agencyInfoDTO = agencyService.getAgencyInfoDTO(formDTO.getAreaCode(), formDTO.getAgencyId());
         List<String> orgIds = new ArrayList<>();

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++){

epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml

@@ -28,6 +28,7 @@
         AND sw.month_id >= #{startMonth}
         AND sw.month_id <![CDATA[ <= ]]> #{endMonth}
         AND wrd.data_type = #{dataType}
+        and sw.CUSTOMER_ID=#{customerId}
         GROUP BY
             sw.month_id,sw.meeting_code
         ORDER BY
@@ -43,6 +44,7 @@
         FROM
          screen_work_record_org_monthly m
         WHERE m.DEL_FLAG = '0'
+        and m.CUSTOMER_ID=#{customerId}
         AND m.TYPE_CODE =(
             SELECT
             dict.RESOURCE_CODE