Merge remote-tracking branch 'remotes/origin/dev'

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

@@ -7,7 +7,7 @@
         SELECT
             fact.index_code AS "key",
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
-            fact.score,
+            fact.score AS score,
             dict.index_name AS "name",
             round(fact.WEIGHT,2) AS weight
         FROM

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

@@ -8,6 +8,7 @@
             fact.index_code AS "key",
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
             dict.index_name AS "name",
+            fact.score AS score,
             round(fact.WEIGHT,2) AS weight
         FROM
             fact_index_community_sub_score fact

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

@@ -8,6 +8,7 @@
             fact.index_code AS "key",
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
             dict.index_name AS "name",
+            fact.score AS score,
             round(fact.WEIGHT,2) AS weight
         FROM
             fact_index_grid_sub_score fact