From c9c78f3f56383fa22fcd1842fc8cc5a9489ad855 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 29 Oct 2020 10:50:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E6=8C=87=E6=95=B0=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AnNingSubAgencyIndexRankResultDTO.java    | 22 +++++++++++++++++++
 .../screen/ScreenIndexDataMonthlyDao.xml      |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AnNingSubAgencyIndexRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AnNingSubAgencyIndexRankResultDTO.java
index c4653c9a71..38df1662f2 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AnNingSubAgencyIndexRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AnNingSubAgencyIndexRankResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.evaluationindex.screen.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,6 +39,21 @@ public class AnNingSubAgencyIndexRankResultDTO implements Serializable {
      */
     private Double serviceAbility = 0.0;
 
+    /**
+     * 党建能力权重
+     */
+    private Double partyWeight;
+
+    /**
+     * 治理能力权重
+     */
+    private Double governWeight;
+
+    /**
+     * 服务能力权重
+     */
+    private Double serviceWeight;
+
     /**
      * 组织id或者网格id
      */
@@ -47,4 +63,10 @@ public class AnNingSubAgencyIndexRankResultDTO implements Serializable {
      * 组织类型
      */
     private String orgType = "";
+
+    public AnNingSubAgencyIndexRankResultDTO() {
+        this.partyWeight = NumConstant.ZERO_DOT_ZERO;
+        this.governWeight = NumConstant.ZERO_DOT_ZERO;
+        this.serviceWeight = NumConstant.ZERO_DOT_ZERO;
+    }
 }
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 c5a9a6305d..55dd281ff5 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
@@ -69,6 +69,9 @@
         service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility,
         party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility,
         govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility,
+        PARTY_DEV_WEIGHT AS partyWeight,
+        GOVERN_ABLITY_WEIGHT AS governWeight,
+        SERVICE_ABLITY_WEIGHT AS serviceWeight,
         ORG_ID orgId,
         ORG_TYPE orgType
         FROM