对外接口添加权重返参

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

@@ -55,6 +55,14 @@ public class MonthScoreListResultDTO implements Serializable {
          */
         @JsonIgnore
         private String indexCode;
+        /**
+         * 自身指标权重
+         */
+        private Double selfWeight;
+        /**
+         * 下级指标权重
+         */
+        private Double subWeight;
 
     }
 

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

@@ -55,7 +55,9 @@
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
-            fact.index_code AS "indexCode"
+            fact.index_code AS "indexCode",
+            self.SELF_WEIGHT AS "selfWeight",
+            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

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

@@ -55,7 +55,9 @@
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
-            fact.index_code AS "indexCode"
+            fact.index_code AS "indexCode",
+            self.SELF_WEIGHT AS "selfWeight",
+            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

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

@@ -56,7 +56,9 @@
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
-            fact.index_code AS "indexCode"
+            fact.index_code AS "indexCode",
+            self.SELF_WEIGHT AS "selfWeight",
+            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