还原

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;
-
     /**
      * 本级分数(保留一位小数)
      */

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

@@ -25,8 +25,7 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalOriginScoreBak",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
-            ROUND(self.sub_score,1)+ROUND(self.self_score,1) as indexTotalOriginScore,
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.self_score,1) AS selfOriginScore,

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

@@ -25,8 +25,7 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalOriginScoreBak",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
-            ROUND(self.self_score, 1)+ROUND(self.sub_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,

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

@@ -25,8 +25,7 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalOriginScoreBak",
+            ROUND(fact.score,1) AS "indexTotalOriginScore",
-            ROUND(self.self_score, 1)+ROUND(self.sub_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,