Merge remote-tracking branch 'origin/dev_data_fusion' into develop

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml

@@ -34,19 +34,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}

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,
+                            (System.currentTimeMillis() - start) / 1000);
-                            formDTO.getCustomerAreaCode());
                 }
 
                 redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()));