Merge remote-tracking branch 'remotes/origin/dev'

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

@@ -30,6 +30,14 @@ public class MonthScoreListResultDTO implements Serializable {
          * 能力总分
          */
         private Double indexTotal;
+        /**
+         * 能力总分在上级的权重
+         */
+        private Double indexTotalSupWeight;
+        /**
+         * 能力总分原始值
+         */
+        private Double indexTotalOriginScore;
         /**
          * 本级能力分
          */

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

@@ -21,6 +21,14 @@ public class ScoreListResultDTO implements Serializable {
      * 总分(保留一位小数)
      */
     private Double indexTotal;
+    /**
+     * 能力总分在上级的权重
+     */
+    private Double indexTotalSupWeight;
+    /**
+     * 能力总分原始值
+     */
+    private Double indexTotalOriginScore;
     /**
      * 本级分数(保留一位小数)
      */

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

@@ -25,6 +25,8 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             self.self_score AS selfOriginScore,
             self.SELF_WEIGHT AS agencyWeight,
@@ -49,6 +51,8 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*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(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode"

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

@@ -25,6 +25,8 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             self.self_score AS selfOriginScore,
             self.SELF_WEIGHT AS agencyWeight,
@@ -49,6 +51,8 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*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(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode"

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

@@ -25,6 +25,8 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             self.self_score AS selfOriginScore,
             self.SELF_WEIGHT AS agencyWeight,
@@ -50,6 +52,8 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*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(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode"