From c6c1f05d8b1af3bc6f9e6cc1eea8f378cf8b5817 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 1 Jun 2021 17:24:38 +0800
Subject: [PATCH] =?UTF-8?q?/data/stats/screencoll/usertotaldata=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9EgridMemberTotal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java | 6 ++++++
 .../evaluationindex/screen/ScreenUserTotalDataDao.xml       | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
index 3111d5136d..bc8a2b53b8 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
@@ -64,8 +64,14 @@ public class UserTotalDataFormDTO implements Serializable {
      */
     private Integer projectTotal;
 
+    /**
+     * 06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
+     */
+    private Integer gridMemberTotal;
+
     /**
      * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
      */
     private String dataEndTime;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml
index c3b3ef7de7..4e228f3fed 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml
@@ -25,6 +25,7 @@
         TOPIC_TOTAL,
         ISSUE_TOTAL,
         PROJECT_TOTAL,
+        GRID_MEMBER_TOTAL,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -47,6 +48,7 @@
             #{item.topicTotal},
             #{item.issueTotal},
             #{item.projectTotal},
+            #{item.gridMemberTotal},
             0,
             0,
             'APP_USER',