From 01c986d2157900e2714961284b67b6753a9ee301 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 19 May 2021 14:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=88=E5=BA=A6=E5=BE=97?=
 =?UTF-8?q?=E5=88=86=E6=B7=BB=E5=8A=A0=20=E5=8E=9F=E5=A7=8B=E5=BE=97?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/IndexScoreResultDTO.java       | 21 +++++++++++++++++++
 .../screen/ScreenIndexDataMonthlyDao.xml      |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexScoreResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexScoreResultDTO.java
index 33ffff9c5d..4f145e3d8a 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexScoreResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/IndexScoreResultDTO.java
@@ -26,7 +26,14 @@ public class IndexScoreResultDTO implements Serializable {
      */
     @JsonIgnore
     private String party;
+    /**
+     * 党建能力 乘以权重后得分
+     */
     private BigDecimal partyDevAbility;
+    /**
+     * 党建能力 原始得分
+     */
+    private BigDecimal partyOriginScore;
     /**
      * 党建能力权重(保留一位小数)
      */
@@ -36,7 +43,14 @@ public class IndexScoreResultDTO implements Serializable {
      */
     @JsonIgnore
     private String govern;
+    /**
+     * 治理能力 乘以权重后得分
+     */
     private BigDecimal governAbility;
+    /**
+     * 治理能力 原始得分
+     */
+    private BigDecimal governOriginScore;
     /**
      * 治理能力权重(保留一位小数)
      */
@@ -46,7 +60,14 @@ public class IndexScoreResultDTO implements Serializable {
      */
     @JsonIgnore
     private String service;
+    /**
+     * 服务能力 乘以权重后得分
+     */
     private BigDecimal serviceAbility;
+    /**
+     * 服务能力 原始得分
+     */
+    private BigDecimal serviceOriginScore;
     /**
      * 服务能力权重(保留一位小数)
      */
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 7e114d857c..072c90a494 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -176,10 +176,13 @@
         SELECT
             index_total AS "total",
             (party_dev_ablity * party_dev_weight) AS "party",
+            ROUND(party_dev_ablity,1) partyOriginScore,
             party_dev_weight AS "partyDevAbilityWeight",
             (govern_ablity * govern_ablity_weight) AS "govern",
+            ROUND(govern_ablity,1) governOriginScore,
             govern_ablity_weight AS "governAbilityWeight",
             (service_ablity * service_ablity_weight) AS "service",
+            ROUND(service_ablity,1) serviceOriginScore,
             service_ablity_weight AS "serviceAbilityWeight"
         FROM
             screen_index_data_monthly