Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

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

@@ -25,7 +25,7 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalSupWeight",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             self.self_score AS selfOriginScore,
@@ -51,7 +51,7 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalSupWeight",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",

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

@@ -25,7 +25,7 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalSupWeight",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             self.self_score AS selfOriginScore,
@@ -51,7 +51,7 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalSupWeight",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",

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

@@ -25,7 +25,7 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalSupWeight",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             self.self_score AS selfOriginScore,
@@ -52,7 +52,7 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalSupWeight",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",