From 57d76e6486a90dd0a3e5b0104962278d7c77d833 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 20 Aug 2020 17:31:00 +0800
Subject: [PATCH] =?UTF-8?q?10=E3=80=81=E5=85=9A=E5=BB=BA=E5=BC=95=E9=A2=86?=
 =?UTF-8?q?-=E5=85=88=E9=94=8B=E6=A8=A1=E8=8C=83=E6=95=B0=E6=8D=AE=20=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screencoll/form/PioneerDataFormDTO.java   | 31 +++++++++++++++++--
 .../screen/ScreenPioneerDataEntity.java       | 30 ++++++++++++++++--
 .../mapper/screen/ScreenPioneerDataDao.xml    | 15 +++++++--
 3 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
index cdad61be67..0efe2ff448 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.screencoll.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 10、党建引领-先锋模范数据
@@ -35,9 +36,9 @@ public class PioneerDataFormDTO implements Serializable {
     private String orgName;
 
     /**
-     * 用户总数
+     * 党员发布议题
      */
-    private Integer userTotal;
+    private Integer publishIssueTotal;
 
     /**
      * 议事数
@@ -58,4 +59,30 @@ public class PioneerDataFormDTO implements Serializable {
      * 解决项目总数
      */
     private Integer resolvedProjectTotal;
+
+
+    /**
+     * 议事占比
+     */
+    private BigDecimal issueRatio;
+
+    /**
+     * 话题占比
+     */
+    private BigDecimal topicRatio;
+
+    /**
+     * 议题转项目占比
+     */
+    private BigDecimal shiftProjectRatio;
+
+    /**
+     * 解决项目占比
+     */
+    private BigDecimal resolvedProjectRatio;
+
+    /**
+     * 党员发布议题占比
+     */
+    private BigDecimal publishIssueRatio;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java
index ab192e7161..4366427141 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java
@@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -64,9 +65,9 @@ public class ScreenPioneerDataEntity extends BaseEpmetEntity {
 	private String orgName;
 
     /**
-     * 用户总数
+     * 党员发布议题
      */
-	private Integer userTotal;
+	private Integer publishIssueTotal;
 
     /**
      * 议事数
@@ -88,4 +89,29 @@ public class ScreenPioneerDataEntity extends BaseEpmetEntity {
      */
 	private Integer resolvedProjectTotal;
 
+
+	/**
+	 * 议事占比
+	 */
+	private BigDecimal issueRatio;
+
+    /**
+     * 话题占比
+     */
+    private BigDecimal topicRatio;
+
+    /**
+     * 议题转项目占比
+     */
+    private BigDecimal shiftProjectRatio;
+
+    /**
+     * 解决项目占比
+     */
+    private BigDecimal resolvedProjectRatio;
+
+    /**
+     * 党员发布议题占比
+     */
+    private BigDecimal publishIssueRatio;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
index 73e703ae25..c140b7d3f3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
@@ -21,11 +21,16 @@
         ORG_ID,
         PARENT_ID,
         ORG_NAME,
-        USER_TOTAL,
+        PUBLISH_ISSUE_TOTAL,
         ISSUE_TOTAL,
         TOPIC_TOTAL,
         SHIFT_PROJECT_TOTAL,
         RESOLVED_PROJECT_TOTAL,
+        PUBLISH_ISSUE_RATIO,
+        ISSUE_RATIO,
+        TOPIC_RATIO,
+        SHIFT_PROJECT_RATIO,
+        RESOLVED_PROJECT_TOTAL_RATIO,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -41,11 +46,17 @@
             #{item.orgId},
             #{item.parentId},
             #{item.orgName},
-            #{item.userTotal},
+            #{item.publishIssueTotal},
             #{item.issueTotal},
             #{item.topicTotal},
             #{item.shiftProjectTotal},
             #{item.resolvedProjectTotal},
+
+            #{item.issueRatio},
+            #{item.topicRatio},
+            #{item.shiftProjectRatio},
+            #{item.resolvedProjectRatio},
+            #{item.publishIssueRatio},
             0,
             0,
             'APP_USER',