Merge remote-tracking branch '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

@@ -19,7 +19,7 @@ public class AblityListResultDTO implements Serializable {
      */
     private String name;
     /**
-     * 指标对应值（数值或百分比）
+     * 指标对应值（数值或百分比）原始值
      */
     private String value = "0";
     /**
@@ -36,4 +36,6 @@ public class AblityListResultDTO implements Serializable {
      */
     private BigDecimal weight;
 
+    private Double score;
+
 }

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

@@ -25,9 +25,17 @@ public class ScoreListResultDTO implements Serializable {
      * 本级分数(保留一位小数)
      */
     private Double agencyScore;
+
+    private Double selfOriginScore;
+
+    private Double agencyWeight;
     /**
      * 下级分数(保留一位小数)
      */
     private Double subAgencyScore;
 
+    private Double subAgencyWeight;
+
+    private Double subOriginScore;
+
 }

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

@@ -26,7 +26,11 @@
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore"
+            self.self_score AS selfOriginScore,
+            self.SELF_WEIGHT AS agencyWeight,
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            self.sub_score AS subOriginScore,
+            self.SUB_WEIGHT AS subAgencyWeight
         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/FactIndexAgencySubScoreDao.xml

@@ -7,6 +7,7 @@
         SELECT
             fact.index_code AS "key",
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
+            fact.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/FactIndexCommunityScoreDao.xml

@@ -26,7 +26,11 @@
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore"
+            self.self_score AS selfOriginScore,
+            self.SELF_WEIGHT AS agencyWeight,
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            self.sub_score AS subOriginScore,
+            self.SUB_WEIGHT AS subAgencyWeight
         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

@@ -26,7 +26,11 @@
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore"
+            self.self_score AS selfOriginScore,
+            self.SELF_WEIGHT AS agencyWeight,
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
+            self.sub_score AS subOriginScore,
+            self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_grid_score fact
         INNER JOIN fact_index_grid_self_sub_score self ON fact.grid_id = self.grid_id