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

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AblityListResultDTO.java

@@ -3,6 +3,7 @@ package com.epmet.evaluationindex.screen.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  *  按月查询各项指标数据--接口返参
@@ -30,4 +31,9 @@ public class AblityListResultDTO implements Serializable {
      */
     private String showType;
 
+    /**
+     * 指标对应的权重
+     */
+    private BigDecimal weight;
+
 }

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

@@ -7,7 +7,8 @@
         SELECT
             fact.index_code AS "key",
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
-            dict.index_name AS "name"
+            dict.index_name AS "name",
+            round(fact.WEIGHT,2) AS weight
         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/FactIndexCommunitySubScoreDao.xml

@@ -7,7 +7,8 @@
         SELECT
             fact.index_code AS "key",
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
-            dict.index_name AS "name"
+            dict.index_name AS "name",
+            round(fact.WEIGHT,2) AS weight
         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/FactIndexGridSubScoreDao.xml

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