images;
+
+ /**
+ * 部门名称
+ */
+ private String deptName;
+
+ /**
+ * 创建时间
+ */
+ private String createdTime;
+
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java
new file mode 100644
index 0000000..17c9f46
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java
@@ -0,0 +1,61 @@
+package com.elink.esua.epdc.dto.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 话题列表DTO
+ * @Author yinzuomei
+ * @Date 2020/2/10 11:31
+ */
+@Data
+public class TopicResultDTO implements Serializable {
+ private static final long serialVersionUID = -1938141144074477454L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 话题摘要
+ */
+ private String topicContent;
+
+ /**
+ * 所有部门
+ */
+ private String allDeptNames;
+
+ /**
+ * 网格来源群名称
+ */
+ private String groupName;
+
+ /**
+ * 话题发布人姓名
+ */
+ private String nickName;
+
+ /**
+ * 发布时间
+ */
+ private Date releaseTime;
+
+ /**
+ * 评论数（评论+回复）
+ */
+ private Integer commentNum;
+
+ /**
+ * 浏览数
+ */
+ private Integer browseNum;
+
+ /**
+ * 表达态度（评论+回复+浏览）
+ */
+ private Integer expressAttitudeNum;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
new file mode 100644
index 0000000..c3b3d37
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
@@ -0,0 +1,146 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.user;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 网格开通情况
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@Data
+public class MetaUserGridOpiningDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 网格id
+ */
+ private String gridId;
+
+ /**
+ * 用户总数
+ */
+ private int registerCount;
+
+ /**
+ * 党员数
+ */
+ private int partyCount;
+
+ /**
+ * 已注册居民
+ */
+ private int residentCount;
+
+ /**
+ * 未注册居民
+ */
+ private int unAuthorizedCount;
+
+ /**
+ * 新闻发布数
+ */
+ private int newsCount;
+
+ /**
+ * 社群数
+ */
+ private int communityCount;
+
+ /**
+ * 群成员数
+ */
+ private int communityMemberCount;
+
+ /**
+ * 群话题数
+ */
+ private int communityTopicCount;
+
+ /**
+ * 议题总数
+ */
+ private int eventCount;
+
+ /**
+ * 项目数
+ */
+ private int itemCount;
+
+ /**
+ * 项目已解决数
+ */
+ private int itemCloseCount;
+
+ /**
+ * 好评数
+ */
+ private int itemPraiseCount;
+
+ /**
+ * 网格名称
+ */
+ private String allDeptName;
+
+ /**
+ * 网格党建指导员姓名
+ */
+ private String gridLeader;
+
+ /**
+ * 删除标记
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 注册时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java
new file mode 100644
index 0000000..be8c514
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java
@@ -0,0 +1,127 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.user;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 党员排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Data
+public class MetaUserPartyRankDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 街道id
+ */
+ private String streetId;
+
+ /**
+ * 街道名称
+ */
+ private String streetName;
+
+ /**
+ * 已注册党员数量（已认证）
+ */
+ private Integer partyMemberCount;
+
+ /**
+ * 年龄超过50岁党员数量
+ */
+ private Integer oldCount;
+
+ /**
+ * 老龄化比例
+ */
+ private BigDecimal oldPercent;
+
+ /**
+ * 年龄50岁以下的党员数量
+ */
+ private Integer youngCount;
+
+ /**
+ * 年轻化比例
+ */
+ private BigDecimal youngPercent;
+
+ /**
+ * 男
+ */
+ private Integer maleCount;
+
+ /**
+ * 女
+ */
+ private Integer femaleCount;
+
+ /**
+ * 未知性别
+ */
+ private Integer unknownSexCount;
+
+ /**
+ * 党员认证失败数
+ */
+ private Integer partyAuthFailureCount;
+
+ /**
+ * 删除标记
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 注册时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java
new file mode 100644
index 0000000..52f3b71
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.user;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 用户注册排行
+ *
+ * @author qu elink@elink-cn.com
+ * @since v1.0.0 2020-03-26
+ */
+@Data
+public class MetaUserRegisterRankDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 街道id
+ */
+ private String streetId;
+
+ /**
+ * 街道名称
+ */
+ private String streetName;
+
+ /**
+ * 用户总数
+ */
+ private Integer userCount;
+
+ /**
+ * 党员数
+ */
+ private Integer partyMemberCount;
+
+ /**
+ * 已注册居民
+ */
+ private Integer residentCount;
+
+ /**
+ * 为注册居民
+ */
+ private Integer unAuthorizedCount;
+
+ /**
+ * 年龄超过50岁
+ */
+ private Integer oldCount;
+
+ /**
+ * 老龄化比例
+ */
+ private BigDecimal oldPercent;
+
+ /**
+ * 50岁以下用户数量
+ */
+ private Integer youngCount;
+
+ /**
+ * 年轻化比例
+ */
+ private BigDecimal youngPercent;
+
+ /**
+ * 男
+ */
+ private Integer maleCount;
+
+ /**
+ * 女
+ */
+ private Integer femaleCount;
+
+ /**
+ * 未知性别
+ */
+ private Integer unknownSexCount;
+
+ /**
+ * 删除标记
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 注册时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java
new file mode 100644
index 0000000..8641b88
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java
@@ -0,0 +1,15 @@
+package com.elink.esua.epdc.dto.user;
+
+import lombok.Data;
+
+/**
+ * 用户注册数据分析
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/2/11 10:43
+ */
+@Data
+public class UserAnalysisDTO {
+
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java
new file mode 100644
index 0000000..f8ebbe5
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java
@@ -0,0 +1,25 @@
+package com.elink.esua.epdc.dto.user.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ExportOperationFormDTO implements Serializable {
+
+ private String operationStartTime;
+
+ private String operationEndTime;
+
+ /**
+ * 所有部门列表
+ */
+ private List allDeptIdsShow;
+
+ private List allStreetIds;
+
+ private String endTime;
+
+ private List deptIdList;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java
new file mode 100644
index 0000000..9509ffb
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java
@@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.user.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author songyunpeng
+ * @Description 党员老龄化和年轻化排名查询表单
+ * @create 2020-02-11 10:53 上午
+ */
+@Data
+public class MemberRankFormDTO {
+
+ /**
+ * 页码
+ */
+ @NotNull(message = "页码不能为空")
+ private Integer pageIndex;
+ /**
+ * 页容量
+ */
+ @NotNull(message = "分页数量不能为空")
+ private Integer pageSize;
+ /**
+ * 时间戳(yyyy-MM-dd HH:mm:ss)
+ */
+ @NotBlank(message = "时间戳不能为空")
+ private String timestamp;
+ /**
+ * 排序状态（1：降序，2升序）
+ */
+ @NotBlank(message = "排序状态不能为空")
+ private String sortState;
+ /**
+ * 部门Id
+ */
+ private String deptId;
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java
new file mode 100644
index 0000000..f47fd38
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java
@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.dto.user.form;
+
+import lombok.Data;
+
+/**
+ * @program: esua-epdc-cloud
+ * @description: 用户数据统计/网格开通数量
+ * @author: wangtong
+ * @create: 2020-02-12 10:03
+ **/
+@Data
+public class UserCountDTO{
+
+
+ /**
+ * 部门id
+ */
+ private String deptId;
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java
new file mode 100644
index 0000000..4238927
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java
@@ -0,0 +1,13 @@
+package com.elink.esua.epdc.dto.user.form;
+
+import lombok.Data;
+
+/**
+ * 用户注册数据分析
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/2/11 09:43
+ */
+@Data
+public class UserRegisterDataFormDTO {
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java
new file mode 100644
index 0000000..ac299bb
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java
@@ -0,0 +1,47 @@
+package com.elink.esua.epdc.dto.user.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author lpf
+ * @Description 用户排名
+ * @create 2020-02-11 10:53 上午
+ */
+@Data
+public class UserSortRankFormDTO {
+
+ /**
+ * 页码
+ */
+ @NotNull(message = "页码不能为空")
+ private Integer pageIndex;
+ /**
+ * 页容量
+ */
+ @NotNull(message = "分页数量不能为空")
+ private Integer pageSize;
+ /**
+ * 时间戳(yyyy-MM-dd HH:mm:ss)
+ */
+ @NotBlank(message = "时间戳不能为空")
+ private String timestamp;
+ /**
+ * 排序状态（1：降序，2升序）
+ */
+ @NotBlank(message = "排序状态不能为空")
+ private String sortState ="1";
+ /**
+ * 排序类型（1：按用户数，2按党员数）
+ */
+ @NotBlank(message = "排序类型")
+ private String sortType = "1";
+ /**
+ * 部门Id
+ */
+ private String deptId;
+
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java
new file mode 100644
index 0000000..3762374
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java
@@ -0,0 +1,81 @@
+package com.elink.esua.epdc.dto.user.result;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * @author: qushutong
+ * @Date: 2020/3/23 14:47
+ * @Description: 运营导出数据
+ */
+@Data
+public class ExportOperationDataResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -798787916350968587L;
+
+ /**
+ * 居民数
+ */
+ private int registerCount = 0;
+
+ /**
+ * 未认证用户数
+ */
+ private int unAuthorizedCount = 0;
+
+
+ /**
+ * 党员数
+ */
+ private int partyCount = 0;
+
+ /**
+ * 新闻发布数
+ */
+ private int newsCount = 0;
+
+
+ /**
+ * 议题数
+ */
+ private int eventCount = 0;
+
+ /**
+ * 项目数
+ */
+ private int itemCount = 0;
+
+ /**
+ * 项目解决数
+ */
+ private int itemCloseCount = 0;
+
+ /**
+ * 社群数
+ */
+ private int communityCount = 0;
+
+ /**
+ * 社群成员数
+ */
+ private int communityMemberCount = 0;
+
+ /**
+ * 社群话题数
+ */
+ private int communityTopicCount = 0;
+
+ /**
+ * 街道
+ */
+ private String streetName;
+
+ /**
+ * 企业数
+ */
+ private int enterpriseCount = 0;
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java
new file mode 100644
index 0000000..be71415
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java
@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+/**
+ * 已开通网格 用户数据总计
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/2/13 13:46
+ */
+@Data
+public class GridDataTotalResultDTO extends GridOpeningResultDTO {
+
+ /**
+ * 已开通网格数
+ */
+ private int workGridCount = 0;
+ /**
+ * 未开通网格数
+ */
+ private int unWorkGridCount = 0;
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java
new file mode 100644
index 0000000..ca89f0e
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java
@@ -0,0 +1,104 @@
+package com.elink.esua.epdc.dto.user.result;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/2/11 13:09
+ * @Description: 开通网格情况
+ */
+@Data
+public class GridOpeningResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -852226852590425991L;
+
+ private String gridId;
+
+ /**
+ * 街道社区网格
+ */
+ private String allDeptName;
+ /**
+ * 用户注册数
+ */
+ private int registerCount = 0;
+ /**
+ * 居民数（包括认证成功和党员认证失败的居民）
+ */
+ private int residentCount = 0;
+
+ /**
+ * 认证党员数
+ */
+ private int partyCount = 0;
+
+ /**
+ * 未认证用户（根据用户第一次扫码的网格统计）
+ */
+ private Integer unAuthorizedCount = 0;
+
+ /**
+ * 居民扫码数
+ */
+ private int ewmCount = 0;
+
+ /**
+ * 新闻数
+ */
+ private int newsCount = 0;
+
+ /**
+ * 通知数
+ */
+ private int noticeCount = 0;
+
+ /**
+ * 议题数
+ */
+ private int eventCount = 0;
+
+ /**
+ * 项目数
+ */
+ private int itemCount = 0;
+
+ /**
+ * 项目解决数
+ */
+ private int itemCloseCount = 0;
+
+ /**
+ * 项目好评数（满意度评价为非常满意）
+ */
+ private int itemPraiseCount = 0;
+
+ /**
+ * 社群数
+ */
+ private int communityCount = 0;
+
+ /**
+ * 社群成员数
+ */
+ private int communityMemberCount = 0;
+
+ /**
+ * 社群话题数
+ */
+ private int communityTopicCount = 0;
+
+ /**
+ * 网格长姓名
+ */
+ private String gridLeader;
+
+ /**
+ * 企业数
+ */
+ private int enterpriseCount = 0;
+
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java
new file mode 100644
index 0000000..6d3e677
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java
@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc-cloud
+ * @description: 网格数量统计Serializable
+ * @author: wangtong
+ * @create: 2020-02-11 14:50
+ **/
+@Data
+public class GriddingCountDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 网格总计
+ **/
+ private Integer gridTotle;
+
+ /**
+ * 开通网格数量
+ **/
+ private Integer gridCount;
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java
new file mode 100644
index 0000000..f10d6d8
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java
@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author songyunpeng
+ * @Description 党员老龄化排名结果
+ * @create 2020-02-11 10:53 上午
+ */
+@Data
+public class OldMemberRankResultDTO implements Serializable {
+ /**
+ * 部门ID
+ */
+ private String deptId;
+ /**
+ * 部门名称
+ */
+ private String deptName;
+ /**
+ * 党员数
+ */
+ private Integer partyMemberCount;
+ /**
+ * 超过50岁党员数
+ */
+ private Integer oldMemberCount;
+ /**
+ * 比例
+ */
+ private String proportion;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java
new file mode 100644
index 0000000..a258488
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java
@@ -0,0 +1,44 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @program: esua-epdc-cloud
+ * @description: 用户数据统计
+ * @author: wangtong
+ * @create: 2020-02-11 12:14
+ **/
+@Data
+public class UserAnalysisCountDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 所有用户数
+ **/
+ private Integer allUserCount;
+
+ /**
+ * 党员数
+ **/
+ private Integer partyMemberCount;
+
+ /**
+ * 居民数
+ **/
+ private Integer userCount;
+
+ /**
+ * 党员认证率
+ **/
+ private BigDecimal partyMemberPercent;
+
+ /**
+ * 居民认证率
+ **/
+ private BigDecimal residentPercent;
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java
new file mode 100644
index 0000000..a725e5c
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java
@@ -0,0 +1,72 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 用户数据排行
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/2/11 14:44
+ */
+@Data
+public class UserDataRankResultDTO {
+
+ /**
+ * 街道id
+ */
+ private String streetId;
+ /**
+ * 街道名称
+ */
+ private String streetName;
+ /**
+ * 用户注册数
+ */
+ private Integer userCount;
+ /**
+ * 男性数
+ */
+ private Integer maleCount;
+ /**
+ * 女性数
+ */
+ private Integer femaleCount;
+ /**
+ * 未知性别数
+ */
+ private Integer unknownSexCount;
+ /**
+ * 居民数（包括认证成功和党员认证居民失败的居民）
+ */
+ private Integer residentCount;
+ /**
+ * 未认证用户（根据用户第一次扫码的网格统计）
+ */
+ private Integer unAuthorizedCount = 0;
+ /**
+ * 党员数
+ */
+ private Integer partyMemberCount;
+ /**
+ * 老人数（年龄大于50）
+ */
+ private Integer oldCount;
+ /**
+ * 年轻人数（年龄不大于50）
+ */
+ private Integer youngCount;
+ /**
+ * 老人比例
+ */
+ private BigDecimal oldPercent;
+ /**
+ * 年轻人比例
+ */
+ private BigDecimal youngPercent;
+ /**
+ * 党员认证失败数
+ */
+ private Integer partyAuthFailureCount;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java
new file mode 100644
index 0000000..1ef2d33
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java
@@ -0,0 +1,13 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+/**
+ * 用户注册数据分析
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/2/11 09:43
+ */
+@Data
+public class UserRegisterDataResultDTO {
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java
new file mode 100644
index 0000000..3fbdb13
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java
@@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 用户数据排行
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/2/11 14:44
+ */
+@Data
+public class UserSortRankResultDTO {
+
+ /**
+ * 街道id
+ */
+ private String deptId;
+ /**
+ * 街道名称
+ */
+ private String deptName;
+ /**
+ * 用户注册数
+ */
+ private Integer allUserCount;
+ /**
+ * 居民数
+ */
+ private Integer userCount;
+ /**
+ * 党员数
+ */
+ private Integer pattyMemberCount;
+
+ /**
+ * 党员占比
+ */
+ private String partyMemberPercent;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java
new file mode 100644
index 0000000..ec567d6
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java
@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author songyunpeng
+ * @Description 党员年轻化排名结果
+ * @create 2020-02-11 10:53 上午
+ */
+@Data
+public class YoungMemberRankResultDTO implements Serializable {
+ /**
+ * 部门ID
+ */
+ private String deptId;
+ /**
+ * 部门名称
+ */
+ private String deptName;
+ /**
+ * 党员数
+ */
+ private Integer partyMemberCount;
+ /**
+ * 超过50岁党员数
+ */
+ private Integer youngMemberCount;
+ /**
+ * 比例
+ */
+ private String proportion;
+}
diff --git a/pom.xml b/pom.xml
index 403e398..f83fe98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
榆山党建e家client模块
-
+ epdc-cloud-analysis-pc-client
epdc-cloud-analysis-client
epdc-cloud-custom-client
epdc-cloud-admin-client