From 5f559a977debe451c754f5e58e2253e60ec84ddd Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 4 Dec 2021 11:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/result/ScoreListResultDTO.java               | 6 ------
 .../main/resources/mapper/fact/FactIndexAgencyScoreDao.xml  | 3 +--
 .../resources/mapper/fact/FactIndexCommunityScoreDao.xml    | 3 +--
 .../main/resources/mapper/fact/FactIndexGridScoreDao.xml    | 3 +--
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScoreListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScoreListResultDTO.java
index dede0eef8c..64d2b02a95 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScoreListResultDTO.java
+++ b/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;
-
     /**
      * 本级分数(保留一位小数)
      */
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml
index 1b52cb5cb6..ce03de993a 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml
+++ b/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(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,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml
index a926fb22fe..1fcb8a4dc1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml
+++ b/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(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,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml
index c9f6568cfd..1b5d82dbd1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml
+++ b/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(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,