From d100bac52f41b1e7dbd066cc2a0c2169489ed60a Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Fri, 6 Aug 2021 10:44:53 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/PartyOrgDTO.java | 136 ++++++++++++++++++ .../elink/esua/epdc/dto/PartyOrgTypeDTO.java | 91 ++++++++++++ 2 files changed, 227 insertions(+) create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgDTO.java create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeDTO.java 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..367e19a --- /dev/null +++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgDTO.java @@ -0,0 +1,136 @@ +/** + * 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; + +} \ No newline at end of file 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 From c69e6bc753997c8df7333424abdfdb57a60b348e Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Fri, 6 Aug 2021 18:09:43 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/PartyOrgDTO.java | 6 ++++- .../esua/epdc/dto/PartyOrgTypeSelectDTO.java | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeSelectDTO.java 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 index 367e19a..da5de59 100644 --- 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 @@ -133,4 +133,8 @@ public class PartyOrgDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file + /** + * 所有部门ID，用于回显修改页面的下拉选项 + */ + private String[] allDeptIdArr; +} 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; +} From ad8182b4590e7c4cba73a578e66a8e9240688a79 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 9 Aug 2021 15:01:11 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/ModuleTypeDTO.java | 101 ++++++++++++++++++ .../com/elink/esua/epdc/dto/NoticeDTO.java | 19 +++- .../elink/esua/epdc/dto/RoleModuleDTO.java | 82 ++++++++++++++ 3 files changed, 200 insertions(+), 2 deletions(-) create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleDTO.java 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..9edb137 --- /dev/null +++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeDTO.java @@ -0,0 +1,101 @@ +/** + * 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-09 + */ +@Data +public class ModuleTypeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 标识号 + */ + private String id; + + /** + * 上级ID + */ + private String pid; + + /** + * 所有上级ID 逗号分隔 + */ + private String pids; + + /** + * 类别名称 + */ + private String typeName; + + /** + * 类别编码 + */ + private String typeCode; + + /** + * 排序 + */ + private Integer sort; + + /** + * 启用标识 0-否，1-是 + */ + private String bannerFlag; + + /** + * 删除标识 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-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..ef3af0a 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,19 @@ public class NoticeDTO implements Serializable { */ private String extendFlag; + /** + * 类别编码 + */ + private String typeCode; + + /** + * 置顶标识 0-否，1-是 + */ + private String topFlag; + + /** + * 上下架状态 0-下架，1-上架 + */ + private String noticeUpDownState; + } \ 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..621c7c5 --- /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 String roleId; + + /** + * 栏目ID + */ + private String 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 From c529b80af85190ced72e06b01d9e3d9b01cb152a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 10 Aug 2021 10:56:52 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/ModuleTypeCategoryDTO.java | 63 +++++++++++++++++++ .../elink/esua/epdc/dto/ModuleTypeDTO.java | 32 +++++----- 2 files changed, 78 insertions(+), 17 deletions(-) create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleTypeCategoryDTO.java 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 index 9edb137..1146981 100644 --- 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 @@ -17,16 +17,17 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 模块类别管理 * * @author qu qu@elink-cn.com - * @since v1.0.0 2021-08-09 + * @since v1.0.0 2021-08-10 */ @Data public class ModuleTypeDTO implements Serializable { @@ -36,12 +37,12 @@ public class ModuleTypeDTO implements Serializable { /** * 标识号 */ - private String id; + private Long id; /** * 上级ID */ - private String pid; + private Long pid; /** * 所有上级ID 逗号分隔 @@ -69,33 +70,30 @@ public class ModuleTypeDTO implements Serializable { private String bannerFlag; /** - * 删除标识 0-否，1-是 + * 删除标识 0：未删除 1：删除 */ - private String delFlag; + private Integer delFlag; /** - * 乐观锁 + * 创建者 */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; + private Long creator; /** * 创建时间 */ - private Date createdTime; + private Date createDate; /** - * 更新人 + * 更新者 */ - private String updatedBy; + private Long updater; /** * 更新时间 */ - private Date updatedTime; + private Date updateDate; + + private String parentName; } \ No newline at end of file From 1195e7166f3cc105fd752ffb46a1d445f2197d0a Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 11 Aug 2021 13:31:09 +0800 Subject: [PATCH 05/16] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=EF=BC=9A=E7=BD=91=E6=A0=BC=E6=B2=BB=E7=90=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9B=B8=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpdcScreenGridGovernanceItemDifficultResultDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; /** * 项目内容 From ea53b72dd227f5dacbc79ab3fbc0b8868e218877 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 11 Aug 2021 13:32:02 +0800 Subject: [PATCH 06/16] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=EF=BC=9A=E7=BD=91=E6=A0=BC=E6=B2=BB=E7=90=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9B=B8=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/form/EpdcScreenGridGovernanceRankingFormDTO.java | 5 +++++ 1 file changed, 5 insertions(+) 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; } From 3874ead9b9b27dbb7ea3edfda3b319188efb1bc9 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 11 Aug 2021 14:22:36 +0800 Subject: [PATCH 07/16] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=EF=BC=9A=E5=85=9A=E5=BB=BA=E5=BC=95=E9=A2=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9B=B8=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eenPartyBuildingBrightIdentityFormDTO.java | 27 ++++++++++ ...cScreenPartyBuildingNoticeListFormDTO.java | 33 +++++++++++++ ...nPartyBuildingBrightIdentityResultDTO.java | 49 +++++++++++++++++++ ...creenPartyBuildingNoticeListResultDTO.java | 44 +++++++++++++++++ ...nPartyBuildingPartyMemberAgeResultDTO.java | 45 +++++++++++++++++ ...cScreenPartyBuildingPartyOrgResultDTO.java | 49 +++++++++++++++++++ ...eenPartyBuildingPartyOrgTypeResultDTO.java | 29 +++++++++++ 7 files changed, 276 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingBrightIdentityFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingNoticeListFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingBrightIdentityResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingNoticeListResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyMemberAgeResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgTypeResultDTO.java 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/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; +} From 0e723a802df3d24d96f72eff8e57521e852e6b8c Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 11 Aug 2021 14:49:01 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/ModuleOption.java | 16 +++++++++ .../elink/esua/epdc/dto/ModuleOptionDTO.java | 33 +++++++++++++++++++ .../com/elink/esua/epdc/dto/NoticeDTO.java | 11 +++++-- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOption.java create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleOptionDTO.java 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/NoticeDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java index ef3af0a..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 @@ -141,9 +141,14 @@ public class NoticeDTO implements Serializable { private String extendFlag; /** - * 类别编码 + * 栏目id */ - private String typeCode; + private String typeId; + + /** + * 所有栏目id + */ + private List allTypeId; /** * 置顶标识 0-否，1-是 @@ -155,4 +160,6 @@ public class NoticeDTO implements Serializable { */ private String noticeUpDownState; + private String typeName; + } \ No newline at end of file From 57330e4f0947080d545ed8c2c1003636cd9be806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Wed, 11 Aug 2021 15:19:41 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/constant/ImgConstant.java | 20 +++ .../com/elink/esua/epdc/dto/AdminImgDTO.java | 86 +++++++++++++ .../com/elink/esua/epdc/dto/SysDeptDTO.java | 58 +++++++++ .../elink/esua/epdc/dto/SysDeptInfoDTO.java | 116 ++++++++++++++++++ 4 files changed, 280 insertions(+) create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/constant/ImgConstant.java create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AdminImgDTO.java create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptInfoDTO.java 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 From 7275ca9d142d7efc3eb2433fe94a688a08cdcc12 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 11 Aug 2021 15:52:53 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=A0=8F=E7=9B=AEDTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/RoleModuleRealationDTO.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleModuleRealationDTO.java 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 From dec65a70d326fc311e5779e7317e34e8bd2512cf Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 11 Aug 2021 16:36:19 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/dto/RoleModuleDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 621c7c5..d38d689 100644 --- 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 @@ -42,12 +42,12 @@ public class RoleModuleDTO implements Serializable { /** * 角色ID */ - private String roleId; + private Long roleId; /** * 栏目ID */ - private String moduleId; + private Long moduleId; /** * 删除标识 0-否，1-是 From 2306d59316c9c4194fb7c1bc9742d4d2157240ea Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 11 Aug 2021 16:38:27 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java | 5 +++++ 1 file changed, 5 insertions(+) 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; } From e9f9201236db249e68bd920f7d31e4dc3faa0ec4 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 11 Aug 2021 16:50:38 +0800 Subject: [PATCH 13/16] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=EF=BC=9A=E5=85=9A=E5=BB=BA=E5=BC=95=E9=A2=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9B=B8=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ScreenPartyBuildingPartyOrgActFormDTO.java | 32 +++++++++++ ...reenPartyBuildingPartyOrgActResultDTO.java | 54 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyBuildingPartyOrgActFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgActResultDTO.java 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..61a05c5 --- /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-三会一课活动次数， 2-联建共建活动次数，3-主题党日活动时长，4-三会一课活动时长，5-联建共建活动时长 + */ + private String orderType; +} 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..8fa903d --- /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 String actZtdrDuration; + + /** + * 三会一课活动时长 + */ + private String actShykDuration; + + /** + * 联建共建活动时长 + */ + private String actLjgjDuration; +} From 34c7f4e96e29c02b548329305936f76ecfe1f7b4 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Wed, 11 Aug 2021 17:01:17 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/dto/PartyOrgDTO.java | 5 +++++ 1 file changed, 5 insertions(+) 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 index da5de59..7997970 100644 --- 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 @@ -137,4 +137,9 @@ public class PartyOrgDTO implements Serializable { * 所有部门ID，用于回显修改页面的下拉选项 */ private String[] allDeptIdArr; + + /** + * 党组织类型标题 + */ + private String typeName; } From 9ccbf0d6718f5e4cb83dfb684d58d9a97ee2b7f2 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 11 Aug 2021 18:50:24 +0800 Subject: [PATCH 15/16] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=EF=BC=9A=E5=85=9A=E5=BB=BA=E5=BC=95=E9=A2=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9B=B8=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpdcScreenPartyBuildingPartyOrgActFormDTO.java | 2 +- .../EpdcScreenPartyBuildingPartyOrgActResultDTO.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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 index 61a05c5..ffbe126 100644 --- 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 @@ -26,7 +26,7 @@ public class EpdcScreenPartyBuildingPartyOrgActFormDTO implements Serializable { private Integer pageSize; /** - * 排序：0-主题党日活动次数，1-三会一课活动次数， 2-联建共建活动次数，3-主题党日活动时长，4-三会一课活动时长，5-联建共建活动时长 + * 排序：0-主题党日活动次数，1-三会一课活动次数， 2-联建共建活动次数，3-主题党日参与人数，4-三会一课参与人数，5-联建共建参与人数 */ private String orderType; } 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 index 8fa903d..f38d1d9 100644 --- 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 @@ -38,17 +38,17 @@ public class EpdcScreenPartyBuildingPartyOrgActResultDTO implements Serializable private Integer actLjgjNum; /** - * 主题党日活动时长 + * 主题党日参与人数 */ - private String actZtdrDuration; + private Integer actZtdrPersonNum; /** - * 三会一课活动时长 + * 三会一课参与人数 */ - private String actShykDuration; + private Integer actShykPersonNum; /** - * 联建共建活动时长 + * 联建共建参与人数 */ - private String actLjgjDuration; + private Integer actLjgjPersonNum; } From 1db4d58ccac9865ebd9651e63d3cd5ea2ad9a270 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 11 Aug 2021 19:07:31 +0800 Subject: [PATCH 16/16] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=EF=BC=9A=E5=85=9A=E5=BB=BA=E5=BC=95=E9=A2=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9B=B8=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/form/EpdcScreenPartyBuildingPartyOrgActFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index ffbe126..db0bfe0 100644 --- 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 @@ -26,7 +26,7 @@ public class EpdcScreenPartyBuildingPartyOrgActFormDTO implements Serializable { private Integer pageSize; /** - * 排序：0-主题党日活动次数，1-三会一课活动次数， 2-联建共建活动次数，3-主题党日参与人数，4-三会一课参与人数，5-联建共建参与人数 + * 排序：0-次数（求和后倒叙），1-参与人数（求和后倒叙） */ private String orderType; }