From 32c92563b47f2d1436b120a3919e7d9fd207b581 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 1 Jan 2022 14:43:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86=20202212?=
 =?UTF-8?q?=E4=B8=BA202112=20=E5=9B=A0=E4=B8=BA=E4=BB=96=E4=BB=AC=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/datareport/controller/screen/IndexController.java   | 4 ++++
 .../service/evaluationindex/screen/impl/IndexServiceImpl.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
index dcf083d507..7e2885cdbd 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
@@ -67,6 +67,10 @@ public class IndexController {
         //area_code升级,新增此参数
         monthBarchartFormDTO.setCustomerId(customerId);
         ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class);
+        String monthId = monthBarchartFormDTO.getMonthId();
+        if ("202212".equals(monthId)){
+            monthBarchartFormDTO.setCustomerId("202112");
+        }
         return new Result<MonthBarchartResultDTO>().ok(indexService.monthBarchart(monthBarchartFormDTO));
     }
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
index 948b543080..8b89c8a2e0 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
+++ b/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(monthBarchartFormDTO));
+        log.info("monthBarchart selectMonthBarchart return:{}", JSON.toJSONString(monthBarchartResults));
         if (monthBarchartResults.size() == NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) {
                 serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO);