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/PartyOrgDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgDTO.java
new file mode 100644
index 0000000..7997970
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgDTO.java
@@ -0,0 +1,145 @@
+/**
+ * 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-06
+ */
+@Data
+public class PartyOrgDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标识号
+ */
+ private String id;
+
+ /**
+ * 党组织名称
+ */
+ private String partyOrgName;
+
+ /**
+ * 党组织介绍
+ */
+ private String introduction;
+
+ /**
+ * 两委干部
+ */
+ private String twoCommittees;
+
+ /**
+ * 党员数量
+ */
+ private Integer partyMemberNum;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 所属组织名称
+ */
+ private String deptName;
+
+ /**
+ * 所属组织ID
+ */
+ private String deptId;
+
+ /**
+ * 党组织类型编码
+ */
+ private String typeCode;
+
+ /**
+ * 父所有部门ID
+ */
+ private String parentDeptIds;
+
+ /**
+ * 父所有部门名称
+ */
+ private String parentDeptNames;
+
+ /**
+ * 所有部门ID
+ */
+ private String allDeptIds;
+
+ /**
+ * 所有部门名称
+ */
+ private String allDeptNames;
+
+ /**
+ * 删除标识 0-否，1-是
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+ /**
+ * 所有部门ID，用于回显修改页面的下拉选项
+ */
+ private String[] allDeptIdArr;
+
+ /**
+ * 党组织类型标题
+ */
+ private String typeName;
+}
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeDTO.java
new file mode 100644
index 0000000..324130a
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeDTO.java
@@ -0,0 +1,91 @@
+/**
+ * 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-06
+ */
+@Data
+public class PartyOrgTypeDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标识号
+ */
+ private String id;
+
+ /**
+ * 类型名称
+ */
+ private String typeName;
+
+ /**
+ * 类型编码
+ */
+ private String typeCode;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+
+ /**
+ * 启用标识 0-否，1-是
+ */
+ private String enable;
+
+ /**
+ * 删除标识 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/PartyOrgTypeSelectDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeSelectDTO.java
new file mode 100644
index 0000000..f240a93
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeSelectDTO.java
@@ -0,0 +1,25 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @auther: zhangyong
+ * @date: 2021-08-06 15:25
+ */
+@Data
+public class PartyOrgTypeSelectDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 类型名称
+ */
+ private String tagName;
+
+ /**
+ * 类型编码
+ */
+ private String tagValue;
+}
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleRealationDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleRealationDTO.java
new file mode 100644
index 0000000..6b02c89
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleRealationDTO.java
@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: epdc-cloud-admin-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-11 15:43
+ **/
+@Data
+public class RoleModuleRealationDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 角色id
+ */
+ private Long id;
+
+ /**
+ * 内容栏目ID列表
+ */
+ private List moduleMenuIdList;
+}
\ 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-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
index 3817152..523b9c1 100644
--- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
@@ -87,4 +87,9 @@ public class SysRoleDTO implements Serializable {
* 吹哨部门id列表
*/
private List whistleDeptIdList;
+
+ /**
+ * 内容栏目ID列表
+ */
+ private List moduleMenuIdList;
}
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
index a12d279..0cc4c85 100644
--- 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
@@ -31,4 +31,9 @@ public class EpdcScreenGridGovernanceRankingFormDTO implements Serializable {
*/
@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/form/EpdcScreenPartyBuildingPartyOrgActFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingPartyOrgActFormDTO.java
new file mode 100644
index 0000000..db0bfe0
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingPartyOrgActFormDTO.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 16:46
+ */
+@Data
+public class EpdcScreenPartyBuildingPartyOrgActFormDTO implements Serializable {
+ private static final long serialVersionUID = 3899868283905151960L;
+
+ /**
+ * 页码 -必传项
+ */
+ @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/result/EpdcScreenGridGovernanceItemDifficultResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemDifficultResultDTO.java
index 97abebf..dfc3ed6 100644
--- 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
@@ -13,9 +13,9 @@ public class EpdcScreenGridGovernanceItemDifficultResultDTO implements Serializa
private static final long serialVersionUID = 6811731619897514999L;
/**
- * 项目ID
+ * 事件ID
*/
- private String id;
+ private String eventId;
/**
* 项目内容
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/EpdcScreenPartyBuildingPartyOrgActResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgActResultDTO.java
new file mode 100644
index 0000000..f38d1d9
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgActResultDTO.java
@@ -0,0 +1,54 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2021/8/11 16:47
+ */
+@Data
+public class EpdcScreenPartyBuildingPartyOrgActResultDTO implements Serializable {
+ private static final long serialVersionUID = -2226492650094839703L;
+
+ /**
+ * 社区ID
+ */
+ private Long deptId;
+
+ /**
+ * 社区名称
+ */
+ private String deptName;
+
+ /**
+ * 主题党日活动次数
+ */
+ private Integer actZtdrNum;
+
+ /**
+ * 三会一课活动次数
+ */
+ private Integer actShykNum;
+
+ /**
+ * 联建共建活动次数
+ */
+ private Integer actLjgjNum;
+
+ /**
+ * 主题党日参与人数
+ */
+ private Integer actZtdrPersonNum;
+
+ /**
+ * 三会一课参与人数
+ */
+ private Integer actShykPersonNum;
+
+ /**
+ * 联建共建参与人数
+ */
+ private Integer actLjgjPersonNum;
+}
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;
+}
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java
new file mode 100644
index 0000000..2efabca
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java
@@ -0,0 +1,16 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 栏目节点
+ *
+ */
+@Data
+public class ModuleOption {
+
+ private List moduleOptions;
+
+}
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java
new file mode 100644
index 0000000..7a8ec90
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java
@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto;
+
+import com.elink.esua.epdc.commons.tools.utils.TreeNode;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-news-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-10 14:49
+ **/
+@Data
+public class ModuleOptionDTO extends TreeNode implements Serializable {
+
+ private Long id;
+
+ private Long pid;
+
+ /**
+ * 栏目名称
+ */
+ private String label;
+
+ /**
+ *栏目id
+ */
+ private Long value;
+
+
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java
new file mode 100644
index 0000000..864a1d9
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java
@@ -0,0 +1,63 @@
+package com.elink.esua.epdc.dto;
+
+import com.elink.esua.epdc.commons.tools.utils.TreeNode;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-news-yushan
+ * @description: 栏目管理树
+ * @author: wangtong
+ * @create: 2021-08-09 16:18
+ **/
+@Data
+public class ModuleTypeCategoryDTO extends TreeNode implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @Null(message = "{id.null}", groups = AddGroup.class)
+ @NotNull(message = "{id.require}", groups = UpdateGroup.class)
+ private Long id;
+
+ /**
+ * 上级分类ID
+ */
+ @NotNull(message = "{sysdept.pid.require}", groups = DefaultGroup.class)
+ private Long pid;
+
+ /**
+ * 分类名称
+ */
+ @NotBlank(message = "{sysdept.name.require}", groups = DefaultGroup.class)
+ private String typeName;
+
+
+ /**
+ * 分类编码
+ */
+ private String typeCode;
+
+ /**
+ * 排序
+ */
+ @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
+ private Integer sort;
+
+ private String parentName;
+
+ private String value;
+
+ private String label;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java
new file mode 100644
index 0000000..1146981
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java
@@ -0,0 +1,99 @@
+/**
+ * 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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 模块类别管理
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-10
+ */
+@Data
+public class ModuleTypeDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标识号
+ */
+ private Long id;
+
+ /**
+ * 上级ID
+ */
+ private Long pid;
+
+ /**
+ * 所有上级ID 逗号分隔
+ */
+ private String pids;
+
+ /**
+ * 类别名称
+ */
+ private String typeName;
+
+ /**
+ * 类别编码
+ */
+ private String typeCode;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+
+ /**
+ * 启用标识 0-否，1-是
+ */
+ private String bannerFlag;
+
+ /**
+ * 删除标识 0：未删除 1：删除
+ */
+ private Integer delFlag;
+
+ /**
+ * 创建者
+ */
+ private Long creator;
+
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+
+ /**
+ * 更新者
+ */
+ private Long updater;
+
+ /**
+ * 更新时间
+ */
+ private Date updateDate;
+
+ private String parentName;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
index c9dd55e..bbbd9a2 100644
--- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
@@ -17,12 +17,12 @@
package com.elink.esua.epdc.dto;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
import java.util.List;
-import lombok.Data;
-
/**
* 通知表
@@ -140,4 +140,26 @@ public class NoticeDTO implements Serializable {
*/
private String extendFlag;
+ /**
+ * 栏目id
+ */
+ private String typeId;
+
+ /**
+ * 所有栏目id
+ */
+ private List allTypeId;
+
+ /**
+ * 置顶标识 0-否，1-是
+ */
+ private String topFlag;
+
+ /**
+ * 上下架状态 0-下架，1-上架
+ */
+ private String noticeUpDownState;
+
+ private String typeName;
+
}
\ No newline at end of file
diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleDTO.java
new file mode 100644
index 0000000..d38d689
--- /dev/null
+++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleDTO.java
@@ -0,0 +1,82 @@
+/**
+ * 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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 角色栏目关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-09
+ */
+@Data
+public class RoleModuleDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标识号
+ */
+ private String id;
+
+ /**
+ * 角色ID
+ */
+ private Long roleId;
+
+ /**
+ * 栏目ID
+ */
+ private Long moduleId;
+
+ /**
+ * 删除标识 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