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

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java

@@ -305,6 +305,7 @@ public class FactIndexServiceImpl implements FactIndexService {
             //3.根据组织级别拼接查询条件，判断查询不同数据表
             //区县级、乡镇街道级
             if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
+                //这里 给孔村镇街道降级为 街道
                 if ("district".equals(agency.getAgencyLevel()) && !"2fe0065f70ca0e23ce4c26fca5f1d933".equals(agency.getCustomerId())) {
                     formDTO.setAllParentIndexCode(FactConstant.QUAN_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
                 } else {

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml

@@ -35,7 +35,9 @@
             self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_agency_score fact
-        INNER JOIN fact_index_agency_self_sub_score self ON fact.agency_id = self.agency_id
+        INNER JOIN fact_index_agency_self_sub_score self ON
+            fact.CUSTOMER_ID = self.CUSTOMER_ID
+            AND fact.agency_id = self.agency_id
             AND fact.month_id = self.month_id
             AND fact.index_code = self.parent_index_code
         WHERE
@@ -60,7 +62,9 @@
             self.SUB_WEIGHT AS "subWeight"
         FROM
             fact_index_agency_score fact
-        INNER JOIN fact_index_agency_self_sub_score self ON fact.agency_id = self.agency_id
+        INNER JOIN fact_index_agency_self_sub_score self ON
+        fact.CUSTOMER_ID = self.CUSTOMER_ID
+        AND fact.agency_id = self.agency_id
         AND fact.month_id = self.month_id
         AND fact.index_code = self.parent_index_code
         WHERE

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml

@@ -35,7 +35,9 @@
             self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_community_score fact
-        INNER JOIN fact_index_community_self_sub_score self ON fact.agency_id = self.agency_id
+        INNER JOIN fact_index_community_self_sub_score self ON
+        fact.CUSTOMER_ID = self.CUSTOMER_ID
+        AND fact.agency_id = self.agency_id
         AND fact.month_id = self.month_id
         AND fact.index_code = self.parent_index_code
         WHERE
@@ -60,7 +62,9 @@
             self.SUB_WEIGHT AS "subWeight"
         FROM
             fact_index_community_score fact
-        INNER JOIN fact_index_community_self_sub_score self ON fact.agency_id = self.agency_id
+        INNER JOIN fact_index_community_self_sub_score self ON
+        fact.CUSTOMER_ID = self.CUSTOMER_ID
+        AND fact.agency_id = self.agency_id
         AND fact.month_id = self.month_id
         AND fact.index_code = self.parent_index_code
         WHERE

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml

@@ -35,7 +35,9 @@
             self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_grid_score fact
-        INNER JOIN fact_index_grid_self_sub_score self ON fact.grid_id = self.grid_id
+        INNER JOIN fact_index_grid_self_sub_score self ON
+        fact.CUSTOMER_ID = self.CUSTOMER_ID
+        AND fact.grid_id = self.grid_id
         AND fact.agency_id = self.agency_id
         AND fact.month_id = self.month_id
         AND fact.index_code = self.parent_index_code
@@ -61,7 +63,9 @@
             self.SUB_WEIGHT AS "subWeight"
         FROM
             fact_index_grid_score fact
-        INNER JOIN fact_index_grid_self_sub_score self ON fact.grid_id = self.grid_id
+        INNER JOIN fact_index_grid_self_sub_score self ON
+        fact.CUSTOMER_ID = self.CUSTOMER_ID
+        AND fact.grid_id = self.grid_id
         AND fact.agency_id = self.agency_id
         AND fact.month_id = self.month_id
         AND fact.index_code = self.parent_index_code