Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

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;
 }

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;
 }

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',