diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/constant/ImgConstant.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/constant/ImgConstant.java
new file mode 100644
index 0000000..136b89d
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/constant/ImgConstant.java
@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.constant;
+
+
+/**
+ * @author: qushutong
+ * @Date: 2021/8/10 16:37
+ * @Description: 图片类型
+ */
+public interface ImgConstant {
+
+ /**
+ * 社会治理业务流转图 类型
+ */
+ String DEPT_BUSINESS_CIRCULATION = "deptBusinessCirculation";
+
+ /**
+ * 党组织架构图 类型
+ */
+ String DEPT_PARTY_ORGANIZATION_STRUCTURE = "deptPartyOrganizationStructure ";
+}
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AdminImgDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AdminImgDTO.java
new file mode 100644
index 0000000..18aa13a
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AdminImgDTO.java
@@ -0,0 +1,86 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 图片表 图片表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-10
+ */
+@Data
+public class AdminImgDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标识号
+ */
+ private String id;
+
+ /**
+ * 引用ID
+ */
+ private String referenceId;
+
+ /**
+ * 图片地址
+ */
+ private String imgUrl;
+
+ /**
+ * 图片类型lllll
+ */
+ private String imgType;
+
+ /**
+ * 删除标识 0-否,1-是
+ */
+ 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-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
index 797d595..ca661c9 100644
--- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
@@ -15,6 +15,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
@@ -29,6 +30,7 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
+@Data
@ApiModel(value = "部门管理")
public class SysDeptDTO extends TreeNode implements Serializable {
private static final long serialVersionUID = 1L;
@@ -79,6 +81,62 @@ public class SysDeptDTO extends TreeNode implements Serializable {
*/
private String parentAreaCode;
+
+ /**
+ * 部门ID
+ */
+ private Long deptId;
+
+ /**
+ * 概况介绍
+ */
+ private String introduction;
+
+ /**
+ * 社区数量
+ */
+ private Integer communityNum;
+
+ /**
+ * 网格数量
+ */
+ private Integer gridNum;
+
+ /**
+ * 网格员数量
+ */
+ private Integer gridmanNum;
+
+ /**
+ * 党员数量
+ */
+ private Integer partyMemberNum;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 辖区面积
+ */
+ private String acreage;
+
+ /**
+ * 社会治理业务流转图
+ */
+ private String deptBusinessUrl;
+
+ /**
+ * 党组织架构图
+ */
+ private String deptPartyUrl;
+
public String getPartyCode() {
return partyCode;
}
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptInfoDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptInfoDTO.java
new file mode 100644
index 0000000..86dfe04
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptInfoDTO.java
@@ -0,0 +1,116 @@
+/**
+ * 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;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 部门信息表 组织信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-10
+ */
+@Data
+public class SysDeptInfoDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标识号
+ */
+ private String id;
+
+ /**
+ * 部门ID
+ */
+ private Long deptId;
+
+ /**
+ * 概况介绍
+ */
+ private String introduction;
+
+ /**
+ * 社区数量
+ */
+ private Integer communityNum;
+
+ /**
+ * 网格数量
+ */
+ private Integer gridNum;
+
+ /**
+ * 网格员数量
+ */
+ private Integer gridmanNum;
+
+ /**
+ * 党员数量
+ */
+ private Integer partyMemberNum;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 辖区面积
+ */
+ private String acreage;
+
+ /**
+ * 删除标识 0-否,1-是
+ */
+ 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/analysis/pc/screen/form/EpdcScreenGridGovernanceItemDifficultFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenGridGovernanceItemDifficultFormDTO.java
new file mode 100644
index 0000000..eb64997
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenGridGovernanceItemDifficultFormDTO.java
@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 9:34
+ */
+@Data
+public class EpdcScreenGridGovernanceItemDifficultFormDTO implements Serializable {
+ private static final long serialVersionUID = 8255572020305039479L;
+
+ /**
+ * 页码 -必传项
+ */
+ @NotNull(message = "页码 不能为空")
+ private Integer pageIndex;
+
+ /**
+ * 页容量 -必传项
+ */
+ @NotNull(message = "页容量 不能为空")
+ private Integer pageSize;
+
+ /**
+ * 排序:0-项目耗时,1-涉及部门数量,2-项目处理次数
+ */
+ private String orderType;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenGridGovernanceItemFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenGridGovernanceItemFormDTO.java
new file mode 100644
index 0000000..5e7bd7b
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenGridGovernanceItemFormDTO.java
@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/10 11:16
+ */
+@Data
+public class EpdcScreenGridGovernanceItemFormDTO implements Serializable {
+ private static final long serialVersionUID = 2516740295976767405L;
+
+ /**
+ * 页码 -必传项
+ */
+ @NotNull(message = "页码 不能为空")
+ private Integer pageIndex;
+
+ /**
+ * 页容量 -必传项
+ */
+ @NotNull(message = "页容量 不能为空")
+ private Integer pageSize;
+
+ /**
+ * 排序:0-最新,1-关注度
+ */
+ private String orderType;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenGridGovernanceRankingFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenGridGovernanceRankingFormDTO.java
new file mode 100644
index 0000000..0cc4c85
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenGridGovernanceRankingFormDTO.java
@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 9:36
+ */
+@Data
+public class EpdcScreenGridGovernanceRankingFormDTO implements Serializable {
+ private static final long serialVersionUID = 931811237478549795L;
+
+ /**
+ * 页码 -必传项
+ */
+ @NotNull(message = "页码 不能为空")
+ private Integer pageIndex;
+
+ /**
+ * 页容量 -必传项
+ */
+ @NotNull(message = "页容量 不能为空")
+ private Integer pageSize;
+
+ /**
+ * 统计类型:year-年度,month-月度
+ */
+ @NotBlank(message = "统计类型不能为空")
+ private String statisticType;
+
+ /**
+ * 排序:0-注册率,1-响应率,2-解决率,3-满意率,4-自治率
+ */
+ private String orderType;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingBrightIdentityFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingBrightIdentityFormDTO.java
new file mode 100644
index 0000000..a2dcc24
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingBrightIdentityFormDTO.java
@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 14:16
+ */
+@Data
+public class EpdcScreenPartyBuildingBrightIdentityFormDTO implements Serializable {
+ private static final long serialVersionUID = 198324926873235506L;
+
+ /**
+ * 页码 -必传项
+ */
+ @NotNull(message = "页码 不能为空")
+ private Integer pageIndex;
+
+ /**
+ * 页容量 -必传项
+ */
+ @NotNull(message = "页容量 不能为空")
+ private Integer pageSize;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingNoticeListFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingNoticeListFormDTO.java
new file mode 100644
index 0000000..acf04a2
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingNoticeListFormDTO.java
@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 14:07
+ */
+@Data
+public class EpdcScreenPartyBuildingNoticeListFormDTO implements Serializable {
+ private static final long serialVersionUID = -2158090912225682073L;
+
+ /**
+ * 页码 -必传项
+ */
+ @NotNull(message = "页码 不能为空")
+ private Integer pageIndex;
+
+ /**
+ * 页容量 -必传项
+ */
+ @NotNull(message = "页容量 不能为空")
+ private Integer pageSize;
+
+ /**
+ * 内容类别
+ */
+ private String typeCode;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemCategoryResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemCategoryResultDTO.java
new file mode 100644
index 0000000..c2a3fc0
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemCategoryResultDTO.java
@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/10 17:57
+ */
+@Data
+public class EpdcScreenGridGovernanceItemCategoryResultDTO implements Serializable {
+ private static final long serialVersionUID = -2864657007061801812L;
+
+ /**
+ * 类别名称
+ */
+ private String categoryName;
+
+ /**
+ * 项目数量
+ */
+ private Integer itemNum;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemDifficultResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemDifficultResultDTO.java
new file mode 100644
index 0000000..dfc3ed6
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemDifficultResultDTO.java
@@ -0,0 +1,44 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 9:32
+ */
+@Data
+public class EpdcScreenGridGovernanceItemDifficultResultDTO implements Serializable {
+ private static final long serialVersionUID = 6811731619897514999L;
+
+ /**
+ * 事件ID
+ */
+ private String eventId;
+
+ /**
+ * 项目内容
+ */
+ private String itemContent;
+
+ /**
+ * 发布时间
+ */
+ private String distributeTime;
+
+ /**
+ * 耗时 单位:小时
+ */
+ private String spendTime;
+
+ /**
+ * 处理次数
+ */
+ private String handleTotal;
+
+ /**
+ * 涉及部门数
+ */
+ private String deptTotal;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemResultDTO.java
new file mode 100644
index 0000000..ec00f9d
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemResultDTO.java
@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/10 13:41
+ */
+@Data
+public class EpdcScreenGridGovernanceItemResultDTO implements Serializable {
+ private static final long serialVersionUID = 5974665915967745709L;
+
+ /**
+ * 项目ID
+ */
+ private String id;
+
+ /**
+ * 项目内容
+ */
+ private String itemContent;
+
+ /**
+ * 项目类别
+ */
+ private String categoryName;
+
+ /**
+ * 关注度
+ */
+ private Integer attentionNum;
+
+ /**
+ * 发布时间
+ */
+ private String distributeTime;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemStatusResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemStatusResultDTO.java
new file mode 100644
index 0000000..1bbfd25
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemStatusResultDTO.java
@@ -0,0 +1,25 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 9:29
+ */
+@Data
+public class EpdcScreenGridGovernanceItemStatusResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -1018653849672131838L;
+
+ /**
+ * 处理中项目数量
+ */
+ private Integer processingNum;
+
+ /**
+ * 已完成项目数量
+ */
+ private Integer completedNum;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceRankingResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceRankingResultDTO.java
new file mode 100644
index 0000000..82b563b
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceRankingResultDTO.java
@@ -0,0 +1,49 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 9:38
+ */
+@Data
+public class EpdcScreenGridGovernanceRankingResultDTO implements Serializable {
+ private static final long serialVersionUID = -7084201309058663620L;
+
+ /**
+ * 社区ID
+ */
+ private Long deptId;
+
+ /**
+ * 社区名称
+ */
+ private String deptName;
+
+ /**
+ * 注册率
+ */
+ private String registrationRate;
+
+ /**
+ * 响应率
+ */
+ private String responseRate;
+
+ /**
+ * 解决率
+ */
+ private String resolutionRate;
+
+ /**
+ * 满意率
+ */
+ private String satisfactionRate;
+
+ /**
+ * 自治率
+ */
+ private String autonomyRate;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingBrightIdentityResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingBrightIdentityResultDTO.java
new file mode 100644
index 0000000..81c0e59
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingBrightIdentityResultDTO.java
@@ -0,0 +1,49 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 14:17
+ */
+@Data
+public class EpdcScreenPartyBuildingBrightIdentityResultDTO implements Serializable {
+ private static final long serialVersionUID = -672315069347084452L;
+
+ /**
+ * 记录ID
+ */
+ private String id;
+
+ /**
+ * 姓名
+ */
+ private String realName;
+
+ /**
+ * 头像
+ */
+ private String faceImg;
+
+ /**
+ * 电话
+ */
+ private String mobile;
+
+ /**
+ * 格言
+ */
+ private String motto;
+
+ /**
+ * 承诺
+ */
+ private String promise;
+
+ /**
+ * 服务范围
+ */
+ private String serviceArea;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingNoticeListResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingNoticeListResultDTO.java
new file mode 100644
index 0000000..273811b
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingNoticeListResultDTO.java
@@ -0,0 +1,44 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 14:08
+ */
+@Data
+public class EpdcScreenPartyBuildingNoticeListResultDTO implements Serializable {
+ private static final long serialVersionUID = -185512704637005754L;
+
+ /**
+ * 内容ID
+ */
+ private String id;
+
+ /**
+ * 内容标题
+ */
+ private String noticeTitle;
+
+ /**
+ * 内容详情
+ */
+ private String noticeContent;
+
+ /**
+ * 内容所属部门
+ */
+ private String deptName;
+
+ /**
+ * 内容发布时间
+ */
+ private String createdTime;
+
+ /**
+ * 置顶标识:0-否,1-是
+ */
+ private String topFlag;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyMemberAgeResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyMemberAgeResultDTO.java
new file mode 100644
index 0000000..6ed89a2
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyMemberAgeResultDTO.java
@@ -0,0 +1,45 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 14:20
+ */
+@Data
+public class EpdcScreenPartyBuildingPartyMemberAgeResultDTO implements Serializable {
+ private static final long serialVersionUID = -5011450676739426378L;
+
+ /**
+ * 18-30岁党员数量
+ */
+ private String ageEighteenThirty;
+
+ /**
+ * 31-40岁党员数量
+ */
+ private String ageThirtyOneForty;
+
+ /**
+ * 41-50岁党员数量
+ */
+ private String ageFortyOneFifty;
+
+ /**
+ * 51-60岁党员数量
+ */
+ private String ageFiftyOneSixty;
+
+ /**
+ * 61-70岁党员数量
+ */
+ private String ageSixtyOneSeventy;
+
+ /**
+ * 70岁以上党员数量
+ */
+ private String ageOverSeventy;
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgResultDTO.java
new file mode 100644
index 0000000..958a796
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgResultDTO.java
@@ -0,0 +1,49 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 14:13
+ */
+@Data
+public class EpdcScreenPartyBuildingPartyOrgResultDTO implements Serializable {
+ private static final long serialVersionUID = -3514737806300104883L;
+
+ /**
+ * 党组织ID
+ */
+ private String id;
+
+ /**
+ * 党组织名称
+ */
+ private String partyOrgName;
+
+ /**
+ * 党组织介绍
+ */
+ private String introduction;
+
+ /**
+ * 两委干部
+ */
+ private String twoCommittees;
+
+ /**
+ * 党员数量
+ */
+ private String partyMemberNum;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgTypeResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgTypeResultDTO.java
new file mode 100644
index 0000000..6e916e6
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgTypeResultDTO.java
@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/11 14:11
+ */
+@Data
+public class EpdcScreenPartyBuildingPartyOrgTypeResultDTO implements Serializable {
+ private static final long serialVersionUID = 9170484251904151403L;
+
+ /**
+ * 党组织类型ID
+ */
+ private String id;
+
+ /**
+ * 党组织类别名称
+ */
+ private String typeName;
+
+ /**
+ * 党组织数量
+ */
+ private String partyOrgNum;
+}