From 6d9dd4b26284424f3ebb9a22d21a62fbfbaf8595 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 12 Sep 2020 14:04:22 +0800
Subject: [PATCH] =?UTF-8?q?screen=5Findex=5Fdata=5Fmonthly=20=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=89=E5=A4=A7=E8=83=BD=E5=8A=9B=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E6=9D=83=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/IndexDataMonthlyFormDTO.java          | 18 ++++++++++++++++++
 .../screen/ScreenIndexDataMonthlyEntity.java   | 17 +++++++++++++++--
 .../screen/ScreenIndexDataMonthlyDao.xml       |  8 ++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java
index c27f75db87..0427ff559c 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java
@@ -64,4 +64,22 @@ public class IndexDataMonthlyFormDTO implements Serializable {
      * 治理能力指数
      */
     private BigDecimal governAblity;
+
+//	PARTY_DEV_WEIGHT	decimal	5	4	0	0	0	0									0	0	0	0	0	0	0
+//	SERVICE_ABLITY_WEIGHT	decimal	5	4	0	0	0	0									0	0	0	0	0	0	0
+//	GOVERN_ABLITY_WEIGHT	decimal	5	4	0	0	0	0								0	0	0	0	0	0	0
+    /**
+     * 党建能力指数权重
+     */
+    private BigDecimal partyDevWeight;
+
+    /**
+     *  服务能力指数 权重
+     */
+    private BigDecimal serviceAblityWeight;
+
+    /**
+     * 治理能力分数，权重
+     */
+    private BigDecimal governAblityWeight;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenIndexDataMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenIndexDataMonthlyEntity.java
index f5b124f54b..0a2fdd7455 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenIndexDataMonthlyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenIndexDataMonthlyEntity.java
@@ -92,8 +92,21 @@ public class ScreenIndexDataMonthlyEntity extends BaseEpmetEntity {
      */
 	private BigDecimal governAblity;
 
+//	PARTY_DEV_WEIGHT	decimal	5	4	0	0	0	0									0	0	0	0	0	0	0
+//	SERVICE_ABLITY_WEIGHT	decimal	5	4	0	0	0	0									0	0	0	0	0	0	0
+//	GOVERN_ABLITY_WEIGHT	decimal	5	4	0	0	0	0								0	0	0	0	0	0	0
 	/**
-	 * 权重（同一组权重总和=1）
+	 * 党建能力指数权重
 	 */
-	private BigDecimal weight;
+	private BigDecimal partyDevWeight;
+
+	/**
+	 *  服务能力指数 权重
+	 */
+	private BigDecimal serviceAblityWeight;
+
+	/**
+	 * 治理能力分数，权重
+	 */
+	private BigDecimal governAblityWeight;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml
index 58ac1baaa4..b699ec7d6b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml
@@ -24,7 +24,9 @@
         PARTY_DEV_ABLITY,
         SERVICE_ABLITY,
         GOVERN_ABLITY,
-        WEIGHT,
+        PARTY_DEV_WEIGHT,
+        SERVICE_ABLITY_WEIGHT,
+        GOVERN_ABLITY_WEIGHT,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -47,7 +49,9 @@
             #{item.partyDevAblity},
             #{item.serviceAblity},
             #{item.governAblity},
-            #{item.weight},
+            #{item.partyDevWeight},
+            #{item.serviceAblityWeight},
+            #{item.governAblityWeight},
             0,
             0,
             'APP_USER',