Merge remote-tracking branch 'origin/dev'

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

@@ -29,12 +29,6 @@ public class ScoreListResultDTO implements Serializable {
      * 能力总分原始值
      */
     private Double indexTotalOriginScore;
-
-    /**
-     * 能力总分原始值-bak,12.4修改
-     */
-    private Double indexTotalOriginScoreBak;
-
     /**
      * 本级分数(保留一位小数)
      */
@@ -50,6 +44,12 @@ public class ScoreListResultDTO implements Serializable {
 
     private Double subAgencyWeight;
 
+    /**
+     * 下级指数=indexTotalOriginScore-selfOriginScore
+     */
     private Double subOriginScore;
-
+    /**
+     * 下级指数，四舍五入，前端不用此值
+     */
+    private Double subOriginScoreBak;
 }

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

@@ -25,14 +25,14 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalOriginScoreBak",
-            ROUND(self.sub_score,1)+ROUND(self.self_score,1) as indexTotalOriginScore,
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*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(self.sub_score,1) AS subOriginScore,
+            ROUND(self.sub_score,1) AS subOriginScoreBak,
+            ROUND(fact.score,1)-ROUND(self.self_score,1) as subOriginScore,
             self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_agency_score fact

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

@@ -25,14 +25,14 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalOriginScoreBak",
-            ROUND(self.self_score, 1)+ROUND(self.sub_score, 1) as indexTotalOriginScore,
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.self_score, 1) AS selfOriginScore,
             self.SELF_WEIGHT AS agencyWeight,
             ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore",
-            ROUND(self.sub_score, 1) AS subOriginScore,
+            ROUND(self.sub_score, 1) AS subOriginScoreBak,
+            ROUND(fact.score,1)-ROUND(self.self_score, 1) as subOriginScore,
             self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_community_score fact

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

@@ -25,14 +25,14 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalOriginScoreBak",
-            ROUND(self.self_score, 1)+ROUND(self.sub_score, 1) as indexTotalOriginScore,
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.self_score, 1) AS selfOriginScore,
             self.SELF_WEIGHT AS agencyWeight,
             ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore",
-            ROUND(self.sub_score, 1) AS subOriginScore,
+            ROUND(self.sub_score, 1) AS subOriginScoreBak,
+            ROUND(fact.score,1)-ROUND(self.self_score, 1) as subOriginScore,
             self.SUB_WEIGHT AS subAgencyWeight
         FROM
             fact_index_grid_score fact