From 90f37d813032e29a93cc7fbb93f139e42571050a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 1 Jul 2021 17:13:11 +0800
Subject: [PATCH 1/2] sl

---
 .../java/com/epmet/controller/IndexCalculateController.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java
index 8471300c71..9add28ae1c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java
@@ -147,12 +147,11 @@ public class IndexCalculateController {
                 long start = System.currentTimeMillis();
                 Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
                 if (aBoolean) {
-                    log.error("客户Id：{},monthId：{}，全部指标计算完成，结果:{},总耗时：{}秒,customerAreaCode：{}",
+                    log.error("客户Id：{},monthId：{}，全部指标计算完成，结果:{},总耗时：{}秒",
                             formDTO.getCustomerId(),
                             formDTO.getMonthId(),
                             aBoolean,
-                            (System.currentTimeMillis() - start) / 1000,
-                            formDTO.getCustomerAreaCode());
+                            (System.currentTimeMillis() - start) / 1000);
                 }
 
                 redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()));

From aeaf88daa9e28a2b843f333d1b6d67b3dd7b2f9e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 1 Jul 2021 17:31:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AF=95=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenIndexDataYearlyDao.xml      | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index 4184ecd513..64ed5e273f 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -31,19 +31,6 @@
         score.ORG_TYPE orgType
         FROM
         screen_index_data_yearly score
-         <if test="orgType != null and orgType != ''">
-            <choose>
-                <when test="orgType == 'grid'">
-                    INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
-                </when>
-                <when test="orgType == 'agency'">
-                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
-                </when>
-                  <when test="orgType == 'department'">
-                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
-                </when>
-            </choose>
-        </if>
         WHERE
         score.del_flag = '0'
         AND score.parent_id = #{agencyId}