diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysEpmetUserRelationDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysEpmetUserRelationDTO.java
new file mode 100644
index 0000000..8730de1
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysEpmetUserRelationDTO.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 项目产品工作人员关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-07-08
+ */
+@Data
+public class SysEpmetUserRelationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 项目端用户ID
+     */
+	private Long sysUserId;
+
+    /**
+     * 产品端工作人员ID
+     */
+	private String staffId;
+
+    /**
+     * 产品端工作人员姓名
+     */
+	private String staffName;
+
+    /**
+     * 产品端工作人员手机号
+     */
+	private String mobile;
+
+    /**
+     * 产品端工作人员所属组织ID
+     */
+	private String agencyId;
+
+    /**
+     * 产品端工作人员所属组织全路径名称
+     */
+	private String agencyAllName;
+
+    /**
+     * 产品端工作人员所属客户id
+     */
+	private String customerId;
+
+    /**
+     * 删除标识 0-否，1-是
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java
index 5540fe0..2f5d908 100644
--- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java
@@ -115,4 +115,9 @@ public class SysUserDTO implements Serializable {
      */
     private String verifyMobile;
 
+    /**
+     * 系统用户绑定的网格员信息
+     */
+    private SysEpmetUserRelationDTO wgyInfo;
+
 }
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java
new file mode 100644
index 0000000..89de94e
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserFormDTO.java
@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.admin;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/7/8 19:08
+ */
+@Data
+public class SysEpmetUserFormDTO implements Serializable {
+    private static final long serialVersionUID = 6400768831973551059L;
+
+    /**
+     * 工作人员手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserResultDTO.java
new file mode 100644
index 0000000..900a74e
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/admin/SysEpmetUserResultDTO.java
@@ -0,0 +1,44 @@
+package com.elink.esua.epdc.dto.admin;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/7/8 19:10
+ */
+@Data
+public class SysEpmetUserResultDTO implements Serializable {
+    private static final long serialVersionUID = 5008884147555281491L;
+
+    /**
+     * 产品端工作人员ID
+     */
+    private String staffId;
+
+    /**
+     * 产品端工作人员姓名
+     */
+    private String staffName;
+
+    /**
+     * 产品端工作人员手机号
+     */
+    private String mobile;
+
+    /**
+     * 产品端工作人员所属组织ID
+     */
+    private String agencyId;
+
+    /**
+     * 产品端工作人员所属组织全路径名称
+     */
+    private String agencyAllName;
+
+    /**
+     * 产品端工作人员所属客户id
+     */
+    private String customerId;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadDataResultDTO.java
new file mode 100644
index 0000000..dcba465
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadDataResultDTO.java
@@ -0,0 +1,123 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 网格员数据分析上报
+ * @Auther: songyunpeng
+ * @Date: 2021-06-25 09:59
+ */
+@Data
+public class GridManagerUploadDataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 日期ID
+     */
+    private String dateId;
+
+    /**
+     * 月ID
+     */
+    private String monthId;
+
+    /**
+     * 年ID
+     */
+    private String yearId;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+
+    /**
+     * 机关id:网格所属的组织id
+     */
+    private String agencyId;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+
+
+
+
+    /**
+     * 工作人员id【网格员基础信息接口获取】
+     */
+    private String staffId	;
+
+    /**
+     * 工作人员姓名【网格员基础信息接口获取】
+     */
+    private String staffName;
+
+    /**
+     * 项目立项数,截止到当前dateId的总数
+     */
+    private Integer projectCount;
+
+    /**
+     * 议题转项目数,截止到当前dateId的总数
+     */
+    private Integer issueToProjectCount	;
+
+    /**
+     * 议题关闭数,截止到当前dateId的总数
+     */
+    private Integer closedIssueCount	;
+
+    /**
+     * 项目响应数,截止到当前dateId的总数
+     */
+    private Integer projectResponseCount	;
+
+    /**
+     * 项目吹哨数,截止到当前dateId的总数
+     */
+    private Integer projectTransferCount		;
+
+    /**
+     * 项目结案数，dateId这一天的增量
+     */
+    private Integer projectClosedCount		;
+
+    /**
+     * 项目结案数，dateId这一天的增量
+     */
+    private Integer projectIncr		;
+
+    /**
+     * 议题转项目数，dateId这一天的增量
+     */
+    private Integer issueToProjectIncr		;
+
+    /**
+     * 议题关闭数，dateId这一天的增量
+     */
+    private Integer closedIssueIncr		;
+
+    /**
+     * 项目响应数，dateId这一天的增量
+     */
+    private Integer projectResponseIncr			;
+
+    /**
+     * 项目吹哨数，dateId这一天的增量
+     */
+    private Integer projectTransferIncr			;
+    /**
+     * 项目结案数，截止到当前dateId的总数
+     */
+    private Integer projectClosedIncr			;
+
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadEventResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadEventResultDTO.java
new file mode 100644
index 0000000..902b67b
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadEventResultDTO.java
@@ -0,0 +1,74 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 网格员事件总数上报
+ * @Auther: songyunpeng
+ * @Date: 2021-06-25 09:59
+ */
+@Data
+public class GridManagerUploadEventResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 日期ID
+     */
+    private String dateId;
+
+    /**
+     * 月ID
+     */
+    private String monthId;
+
+    /**
+     * 年ID
+     */
+    private String yearId;
+
+    /**
+     * 周ID
+     */
+    private String weekId;
+
+
+
+    /**
+     * 季度ID
+     */
+    private String quarterId;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+
+    /**
+     * 机关id:网格所属的组织id
+     */
+    private String agencyId;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+
+
+
+
+    /**
+     * 产品这边工作人员用户id
+     */
+    private String staffId	;
+
+    /**
+     * 事件数
+     */
+    private Integer reportProjectCount;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java
index b5002e8..add1cbb 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UserjoinResultDTO.java
@@ -51,12 +51,12 @@ public class UserjoinResultDTO implements Serializable {
     /**
      * 平均参与度
      */
-    private Integer avgJoin;
+    private Double avgJoin;
 
     /**
      * 人均议题
      */
-    private Integer avgIssue;
+    private Double avgIssue;
     private String areaCode;
     private Integer avgIssueFz;
     private Integer avgIssueFm;
diff --git a/epdc-cloud-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenGridManagerParamDTO.java b/epdc-cloud-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenGridManagerParamDTO.java
new file mode 100644
index 0000000..b66e2c7
--- /dev/null
+++ b/epdc-cloud-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenGridManagerParamDTO.java
@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 网格员事件管理定时任务入参
+ *
+ * @Author：songyunpeng
+ * @Date：2021/03/02 10:30
+ */
+@Data
+public class ScreenGridManagerParamDTO implements Serializable {
+    private static final long serialVersionUID = -8868143963953751575L;
+
+    /**
+     *  网格员事件管理
+     */
+    private String gridManagerUploadEvent;
+
+
+
+}