评价指标模块 设置分值的按照【总分=各个能力值四舍五入保留一位 * 权重 相加，结果值四舍五入保留一位；

三大能力的分=原始值四舍五入保留一位* 权重，结果值四舍五入保留一位；
               单项原始值：直接四舍五入保留一位小数；】调整

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

@@ -6,7 +6,7 @@
     <select id="selectAgencyAblityWeightScoreIndex" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
         SELECT
             fact.month_id AS "monthId",
-            ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
             fact.index_code AS "indexCode"
         FROM
             fact_index_agency_score fact
@@ -50,11 +50,11 @@
     <select id="selectAgencyMonthWeightScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO$ScoreListResultDTO">
         SELECT
             fact.month_id AS "monthId",
-            ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
             ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
-            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
+            ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode",
             self.SELF_WEIGHT AS "selfWeight",
             self.SUB_WEIGHT AS "subWeight"

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

@@ -7,10 +7,10 @@
         SELECT
             fact.index_code AS "key",
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
-            fact.score AS score,
+            round(fact.score,1) AS score,
             dict.index_name AS "name",
             round(fact.WEIGHT,2) AS weight,
-            (fact.SCORE * fact.WEIGHT) AS weightedScore
+            round(round(fact.SCORE,1) * fact.WEIGHT,1) AS weightedScore
         FROM
             fact_index_agency_sub_score fact
         LEFT JOIN index_dict dict ON fact.index_code = dict.index_code

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

@@ -6,7 +6,7 @@
     <select id="selectCommunityAblityWeightScore" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
         SELECT
             fact.month_id AS "monthId",
-            ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
             fact.index_code AS "indexCode"
         FROM
             fact_index_community_score fact
@@ -27,10 +27,10 @@
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
             ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
-            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
+            ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.self_score, 1) AS selfOriginScore,
             self.SELF_WEIGHT AS agencyWeight,
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore",
             ROUND(self.sub_score, 1) AS subOriginScore,
             self.SUB_WEIGHT AS subAgencyWeight
         FROM
@@ -50,11 +50,11 @@
     <select id="selectCommunityMonthWeightScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO$ScoreListResultDTO">
         SELECT
             fact.month_id AS "monthId",
-            ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
             ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
-            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
+            ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode",
             self.SELF_WEIGHT AS "selfWeight",
             self.SUB_WEIGHT AS "subWeight"

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

@@ -8,9 +8,9 @@
             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.score,1) AS score,
             round(fact.WEIGHT,2) AS weight,
-            (fact.SCORE * fact.WEIGHT) AS weightedScore
+            round(round(fact.SCORE,1) * fact.WEIGHT,1) AS weightedScore
         FROM
             fact_index_community_sub_score fact
         LEFT JOIN index_dict dict ON fact.index_code = dict.index_code

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

@@ -6,7 +6,7 @@
     <select id="selectGridAblityWeightScore" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
         SELECT
             fact.month_id AS "monthId",
-            ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
             fact.index_code AS "indexCode"
         FROM
             fact_index_grid_score fact
@@ -27,10 +27,10 @@
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
             ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
-            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
+            ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.self_score, 1) AS selfOriginScore,
             self.SELF_WEIGHT AS agencyWeight,
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore",
             ROUND(self.sub_score, 1) AS subOriginScore,
             self.SUB_WEIGHT AS subAgencyWeight
         FROM
@@ -51,11 +51,11 @@
     <select id="selectGridMonthWeightScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO$ScoreListResultDTO">
         SELECT
             fact.month_id AS "monthId",
-            ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
             ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
-            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
+            ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode",
             self.SELF_WEIGHT AS "selfWeight",
             self.SUB_WEIGHT AS "subWeight"

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

@@ -8,9 +8,9 @@
             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.score,1) AS score,
             round(fact.WEIGHT,2) AS weight,
-            (fact.SCORE * fact.WEIGHT) AS weightedScore
+            round(round(fact.SCORE,1) * fact.WEIGHT,1) AS weightedScore
         FROM
             fact_index_grid_sub_score fact
         LEFT JOIN index_dict dict ON fact.index_code = dict.index_code

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

@@ -88,9 +88,9 @@
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         score.org_name AS `NAME`,
-        score.service_ablity * score.SERVICE_ABLITY_WEIGHT AS serviceAbility,
+        ROUND(ROUND(score.service_ablity,1) * score.SERVICE_ABLITY_WEIGHT, 1) AS serviceAbility,
-        score.party_dev_ablity * score.PARTY_DEV_WEIGHT AS partyDevAbility,
+        ROUND(ROUND(score.party_dev_ablity,1) * score.PARTY_DEV_WEIGHT, 1) AS partyDevAbility,
-        score.govern_ablity * score.GOVERN_ABLITY_WEIGHT AS governAbility,
+        ROUND(ROUND(score.govern_ablity,1) * score.GOVERN_ABLITY_WEIGHT, 1) AS governAbility,
         score.PARTY_DEV_WEIGHT AS partyWeight,
         score.GOVERN_ABLITY_WEIGHT AS governWeight,
         score.SERVICE_ABLITY_WEIGHT AS serviceWeight,
@@ -156,13 +156,13 @@
             org_id AS "orgId",
             org_name AS "orgName",
             <if test="indexCode != null and indexCode != '' and indexCode == 'dangjiannengli'">
-                round((party_dev_ablity * party_dev_weight),1) AS "score"
+                round(round(party_dev_ablity,1) * party_dev_weight,1) AS "score"
             </if>
             <if test="indexCode != null and indexCode != '' and indexCode == 'zhilinengli'">
-                round((govern_ablity * govern_ablity_weight),1) AS "score"
+                round(round(govern_ablity,1) * govern_ablity_weight,1) AS "score"
             </if>
             <if test="indexCode != null and indexCode != '' and indexCode == 'fuwunengli'">
-                round((service_ablity * service_ablity_weight),1) AS "score"
+                round(round(service_ablity,1) * service_ablity_weight,1) AS "score"
             </if>
         FROM
             screen_index_data_monthly
@@ -406,9 +406,9 @@
                     resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
             score.org_name AS `NAME`,
-            score.service_ablity * score.SERVICE_ABLITY_WEIGHT AS serviceAbility,
+            ROUND(ROUND(score.service_ablity,1)*score.SERVICE_ABLITY_WEIGHT, 1)AS serviceAbility,
-            score.party_dev_ablity * score.PARTY_DEV_WEIGHT AS partyDevAbility,
+            ROUND(ROUND(score.party_dev_ablity,1) * score.PARTY_DEV_WEIGHT, 1) AS partyDevAbility,
-            score.govern_ablity * score.GOVERN_ABLITY_WEIGHT AS governAbility,
+            ROUND(ROUND(score.govern_ablity,1) * score.GOVERN_ABLITY_WEIGHT, 1) AS governAbility,
             score.PARTY_DEV_WEIGHT AS partyWeight,
             score.GOVERN_ABLITY_WEIGHT AS governWeight,
             score.SERVICE_ABLITY_WEIGHT AS serviceWeight,