Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java

@@ -69,7 +69,7 @@ public class IndexController {
         ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class);
         String monthId = monthBarchartFormDTO.getMonthId();
         if ("202212".equals(monthId)){
-            monthBarchartFormDTO.setCustomerId("202112");
+            monthBarchartFormDTO.setMonthId("202112");
         }
         return new Result<MonthBarchartResultDTO>().ok(indexService.monthBarchart(monthBarchartFormDTO));
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -121,7 +121,7 @@ public class IndexServiceImpl implements IndexService {
         List<MonthBarchartResult> monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId(),
                                                                                                        monthBarchartFormDTO.getMonthId(),
                                                                                                         monthBarchartFormDTO.getCustomerId());
-        log.info("monthBarchart selectMonthBarchart return:{}", JSON.toJSONString(monthBarchartResults));
+        log.info("monthBarchart selectMonthBarchart return:{}", JSON.toJSONString(monthBarchartFormDTO));
         if (monthBarchartResults.size() == NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) {
                 serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO);