From df6fb291c81baabbbd9b3b6d87f5675ae64ba8e8 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Sat, 21 Aug 2021 13:56:58 +0800 Subject: [PATCH 01/34] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F-?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B2=BB=E7=90=86=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpdcScreenGridGovernanceItemDifficultResultDTO.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/result/EpdcScreenGridGovernanceItemDifficultResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenGridGovernanceItemDifficultResultDTO.java index dfc3ed6..acbd59b 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 @@ -12,6 +12,11 @@ import java.io.Serializable; public class EpdcScreenGridGovernanceItemDifficultResultDTO implements Serializable { private static final long serialVersionUID = 6811731619897514999L; + /** + * 项目ID + */ + private String itemId; + /** * 事件ID */ From 33ef1954fba06d5c5d3b7b348a7453344268960d Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Mon, 23 Aug 2021 18:46:57 +0800 Subject: [PATCH 02/34] =?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 --- .../form/EpdcScreenItemListFormDTO.java | 27 +++++++++++++++ .../result/EpdcScreenItemListResultDTO.java | 34 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenItemListFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenItemListResultDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenItemListFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenItemListFormDTO.java new file mode 100644 index 0000000..21e76ed --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenItemListFormDTO.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/23 18:43 + */ +@Data +public class EpdcScreenItemListFormDTO implements Serializable { + private static final long serialVersionUID = 9002139861797676107L; + + /** + * 页码 -必传项 + */ + @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/result/EpdcScreenItemListResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenItemListResultDTO.java new file mode 100644 index 0000000..28a936c --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenItemListResultDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.analysis.pc.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/23 18:44 + */ +@Data +public class EpdcScreenItemListResultDTO implements Serializable { + private static final long serialVersionUID = -2604744896996074330L; + + /** + * 项目ID + */ + private String id; + + /** + * 项目内容 + */ + private String itemContent; + + /** + * 纬度 + */ + private String issueLatitude; + + /** + * 经度 + */ + private String issueLongitude; +} From ca7bf25d05c5a93401c01155a1acbf66cc9d887c Mon Sep 17 00:00:00 2001 From: zhangfh Date: Tue, 24 Aug 2021 10:04:36 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E8=A1=A8=E5=A2=9E=E5=8A=A0type=5Fkey=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nEpidemicVaccinationStatisticsFormDTO.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicVaccinationStatisticsFormDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicVaccinationStatisticsFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicVaccinationStatisticsFormDTO.java new file mode 100644 index 0000000..1b95f22 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicVaccinationStatisticsFormDTO.java @@ -0,0 +1,21 @@ +package com.elink.esua.epdc.dto.analysis.pc.screen.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 疫情防控-疫苗接种情况请求对象 + * create time: 2021/8/11$ 21:00$ + */ +@Data +public class EpdcScreenEpidemicVaccinationStatisticsFormDTO implements Serializable { + + private static final long serialVersionUID = 1007443787006330567L; + + /** + * 组织类型：街道：street_party，社区：community_party + */ + private String typeKey; +} From a83bdd98ea0ca87cb09bc20051011b2483997dd7 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Tue, 24 Aug 2021 11:19:07 +0800 Subject: [PATCH 04/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpdcWorkbenchDataStatisticsFormDTO.java | 16 +++++ .../EpdcWorkbenchDataStatisticsResultDTO.java | 64 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchDataStatisticsFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchDataStatisticsResultDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchDataStatisticsFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchDataStatisticsFormDTO.java new file mode 100644 index 0000000..1e20a65 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchDataStatisticsFormDTO.java @@ -0,0 +1,16 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/24 11:08 + */ +@Data +public class EpdcWorkbenchDataStatisticsFormDTO implements Serializable { + private static final long serialVersionUID = -3594409498300008030L; + + private Long deptId; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchDataStatisticsResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchDataStatisticsResultDTO.java new file mode 100644 index 0000000..be94ebf --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchDataStatisticsResultDTO.java @@ -0,0 +1,64 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/24 11:08 + */ +@Data +public class EpdcWorkbenchDataStatisticsResultDTO implements Serializable { + private static final long serialVersionUID = 6608581761807835181L; + + /** + * 话题数 + */ + private Integer topicNum; + + /** + * 昨日新增话题数 + */ + private Integer topicAddedYesterdayNum; + + /** + * 议题数 + */ + private Integer issueNum; + + /** + * 昨日新增议题数 + */ + private Integer issueAddedYesterdayNum; + + /** + * 项目数 + */ + private Integer itemNum; + + /** + * 昨日新增项目数 + */ + private Integer itemAddedYesterdayNum; + + /** + * 项目结案数 + */ + private Integer itemCaseClosedNum; + + /** + * 昨日新增项目结案数 + */ + private Integer itemCaseClosedAddedYesterdayNum; + + /** + * 项目督办数 + */ + private Integer superviseItemNum; + + /** + * 昨日新增项目督办数 + */ + private Integer superviseItemAddedYesterdayNum; +} From 8bc42b99d7809294d1cd9621f03ee995efee72fb Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 25 Aug 2021 10:34:28 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=8E=92=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/pc/user/GridOpeningJobDTO.java | 162 ++++++++++++++++++ .../pc/user/result/GridOpeningResultDTO.java | 2 + 2 files changed, 164 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/GridOpeningJobDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/GridOpeningJobDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/GridOpeningJobDTO.java new file mode 100644 index 0000000..242cf52 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/GridOpeningJobDTO.java @@ -0,0 +1,162 @@ +/** + * 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.analysis.pc.user; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Data +public class GridOpeningJobDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 网格id + */ + private String gridid; + + /** + * 街道社区网格 + */ + private String alldeptname; + + /** + * 用户注册数 + */ + private Integer registercount; + + /** + * 居民数（包括认证成功和党员认证失败的居民） + */ + private Integer residentcount; + + /** + * 认证党员数 + */ + private Integer partycount; + + /** + * 未认证用户（根据用户第一次扫码的网格统计） + */ + private Integer unauthorizedcount; + + /** + * 居民扫码数 + */ + private Integer ewmcount; + + /** + * 新闻数 + */ + private Integer newscount; + + /** + * 通知数 + */ + private Integer noticecount; + + /** + * 议题数 + */ + private Integer eventcount; + + /** + * 项目数 + */ + private Integer itemcount; + + /** + * 项目解决数 + */ + private Integer itemclosecount; + + /** + * 项目好评数（满意度评价为非常满意） + */ + private Integer itempraisecount; + + /** + * 社群数 + */ + private Integer communitycount; + + /** + * 社群成员数 + */ + private Integer communitymembercount; + + /** + * 社群话题数 + */ + private Integer communitytopiccount; + + /** + * 企业数 + */ + private Integer enterprisecount; + + /** + * 网格长姓名 + */ + private String gridleader; + + /** + * 所有网格id + */ + private String alldeptids; + + /** + * 删除标记(0-否，1-是) + */ + private String delFlag; + + /** + * 创建人 + */ + 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/user/result/GridOpeningResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GridOpeningResultDTO.java index 894f6fc..af17720 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GridOpeningResultDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/user/result/GridOpeningResultDTO.java @@ -17,6 +17,8 @@ public class GridOpeningResultDTO implements Serializable { private String gridId; + private String allDeptIds; + /** * 街道社区网格 */ From 5b564cde29b3dd3539da42136c9514fdd1463761 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 25 Aug 2021 11:14:23 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E8=AF=B7=E6=B1=82=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0typeKey=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO.java | 5 +++++ ...cScreenVaccinationPersonVaccinationStatisticsFormDTO.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO.java index 9c7d44d..bc1340b 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO.java @@ -18,4 +18,9 @@ public class EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO implements Ser */ private String statisticType; + /** + * 组织类型：街道：street_party，社区：community_party + */ + private String typeKey; + } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO.java index 43cb6e1..910b473 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO.java @@ -17,4 +17,9 @@ public class EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO implements *统计类型：0-已接种，1-未接种 */ private String statisticType; + + /** + * 组织类型：街道：street_party，社区：community_party + */ + private String typeKey; } From 3c19e894f4347b968110dc6f781a29a477d7d77f Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 25 Aug 2021 19:12:30 +0800 Subject: [PATCH 07/34] =?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 --- .../pc/item/DifficultItemOverseeDTO.java | 117 ++++++++++++++++++ .../pc/item/RoleDifficultDeptDTO.java | 82 ++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/DifficultItemOverseeDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/RoleDifficultDeptDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/DifficultItemOverseeDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/DifficultItemOverseeDTO.java new file mode 100644 index 0000000..b17bfef --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/DifficultItemOverseeDTO.java @@ -0,0 +1,117 @@ +/** + * 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.analysis.pc.item; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 难点堵点督办 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-25 + */ +@Data +public class DifficultItemOverseeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 难点堵点ID + */ + private String difficultId; + + /** + * 督办人ID + */ + private String overseeUserId; + + /** + * 督办人姓名 + */ + private String overseeUserName; + + /** + * 督办人部门ID + */ + private String overseeDeptId; + + /** + * 督办人部门名称 + */ + private String overseeDeptName; + + /** + * 督办时间 + */ + private Date overseeTime; + + /** + * 督办描述 + */ + private String overseeContent; + + /** + * 被督办人部门ID + */ + private String beOverseeDept; + + /** + * 被督办人部门名称 + */ + private String beOverseeDeptName; + + /** + * 删除标识 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/item/RoleDifficultDeptDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/RoleDifficultDeptDTO.java new file mode 100644 index 0000000..5de31f2 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/RoleDifficultDeptDTO.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.analysis.pc.item; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 角色难点堵点部门关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-25 + */ +@Data +public class RoleDifficultDeptDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 标识号 + */ + private String id; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 删除标识 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 e3843f5c0c1e2958be68573f0876b0a402a6cf81 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 25 Aug 2021 22:28:00 +0800 Subject: [PATCH 08/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BC=81=E4=B8=9A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...icCompanyVaccinationStatisticsFormDto.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto.java new file mode 100644 index 0000000..28736a4 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.dto.analysis.pc.screen.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: TODO + * create time: 2021/08/25$ 22:21$ + */ +@Data +public class EpdcScreenEpidemicCompanyVaccinationStatisticsFormDto implements Serializable { + private static final long serialVersionUID = -2824808733304558284L; + + /** + * 组织类型：街道：street_party，社区：community_party + */ + private String typeKey; +} From 13253bab9959d710dea794dc33e615ace2da172c Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 26 Aug 2021 11:02:01 +0800 Subject: [PATCH 09/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...orkbenchTopicIssueItemAnalysisFormDTO.java | 16 ++++++++ ...kbenchTopicIssueItemAnalysisResultDTO.java | 39 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchTopicIssueItemAnalysisFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchTopicIssueItemAnalysisResultDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchTopicIssueItemAnalysisFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchTopicIssueItemAnalysisFormDTO.java new file mode 100644 index 0000000..e640e19 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchTopicIssueItemAnalysisFormDTO.java @@ -0,0 +1,16 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/26 11:01 + */ +@Data +public class EpdcWorkbenchTopicIssueItemAnalysisFormDTO implements Serializable { + private static final long serialVersionUID = 400296734298107410L; + + private Long deptId; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchTopicIssueItemAnalysisResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchTopicIssueItemAnalysisResultDTO.java new file mode 100644 index 0000000..4cdeb3a --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchTopicIssueItemAnalysisResultDTO.java @@ -0,0 +1,39 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/26 10:59 + */ +@Data +public class EpdcWorkbenchTopicIssueItemAnalysisResultDTO implements Serializable { + private static final long serialVersionUID = 2307114632327183546L; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 话题数量 + */ + private Integer topicNum; + + /** + * 议题数量 + */ + private Integer issueNum; + + /** + * 项目数量 + */ + private Integer itemNum; +} From 72aa26bd392ca0f0722a5551ca7e17f3c0bcb3ad Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 26 Aug 2021 14:40:53 +0800 Subject: [PATCH 10/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpdcWorkbenchUserAnalysisFormDTO.java | 16 +++++++++ .../EpdcWorkbenchUserAnalysisResultDTO.java | 34 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchUserAnalysisFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchUserAnalysisResultDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchUserAnalysisFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchUserAnalysisFormDTO.java new file mode 100644 index 0000000..28acd7e --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchUserAnalysisFormDTO.java @@ -0,0 +1,16 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/26 14:38 + */ +@Data +public class EpdcWorkbenchUserAnalysisFormDTO implements Serializable { + private static final long serialVersionUID = -3866580648194645619L; + + private Long deptId; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchUserAnalysisResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchUserAnalysisResultDTO.java new file mode 100644 index 0000000..546c2b7 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchUserAnalysisResultDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/26 14:38 + */ +@Data +public class EpdcWorkbenchUserAnalysisResultDTO implements Serializable { + private static final long serialVersionUID = 1947077311885828447L; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 党员数量 + */ + private Integer partyMemberNum; + + /** + * 用户数量 + */ + private Integer userNum; +} From fce53ab56bdfa16991d9d3faff4ad77e953b1065 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 26 Aug 2021 15:54:05 +0800 Subject: [PATCH 11/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EpdcWorkStatusAnalysisFormDTO.java | 21 ++++++++ .../EpdcWorkStatusAnalysisResultDTO.java | 49 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkStatusAnalysisFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkStatusAnalysisResultDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkStatusAnalysisFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkStatusAnalysisFormDTO.java new file mode 100644 index 0000000..9b82a77 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkStatusAnalysisFormDTO.java @@ -0,0 +1,21 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/26 15:50 + */ +@Data +public class EpdcWorkStatusAnalysisFormDTO implements Serializable { + private static final long serialVersionUID = -674921463403947664L; + + private Long deptId; + + /** + * 统计日期类型：yesterday-昨天，lastWeek-上周，lastMonth-上个月 + */ + private String dateType; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkStatusAnalysisResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkStatusAnalysisResultDTO.java new file mode 100644 index 0000000..682bf09 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkStatusAnalysisResultDTO.java @@ -0,0 +1,49 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/26 15:52 + */ +@Data +public class EpdcWorkStatusAnalysisResultDTO implements Serializable { + private static final long serialVersionUID = 9197856525046007900L; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 话题数 + */ + private Integer topicNum; + + /** + * 议题数 + */ + private Integer issueNum; + + /** + * 项目数 + */ + private Integer itemNum; + + /** + * 项目结案数 + */ + private Integer itemCaseClosedNum; + + /** + * 项目督办数 + */ + private Integer superviseItemNum; +} From de94d2b94cce4bad80f0ccfaec1e9327bb2b35f8 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 26 Aug 2021 16:09:15 +0800 Subject: [PATCH 12/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EpdcWorkStatusAnalysisFormDTO.java | 21 ------------------- .../EpdcWorkbenchDataStatisticsFormDTO.java | 3 +++ ...orkbenchTopicIssueItemAnalysisFormDTO.java | 3 +++ .../EpdcWorkbenchUserAnalysisFormDTO.java | 3 +++ 4 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkStatusAnalysisFormDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkStatusAnalysisFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkStatusAnalysisFormDTO.java deleted file mode 100644 index 9b82a77..0000000 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkStatusAnalysisFormDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.elink.esua.epdc.dto.analysis.pc.backstage.form; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Author：liuchuang - * @Date：2021/8/26 15:50 - */ -@Data -public class EpdcWorkStatusAnalysisFormDTO implements Serializable { - private static final long serialVersionUID = -674921463403947664L; - - private Long deptId; - - /** - * 统计日期类型：yesterday-昨天，lastWeek-上周，lastMonth-上个月 - */ - private String dateType; -} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchDataStatisticsFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchDataStatisticsFormDTO.java index 1e20a65..aea78b3 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchDataStatisticsFormDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchDataStatisticsFormDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.analysis.pc.backstage.form; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Author：liuchuang @@ -13,4 +14,6 @@ public class EpdcWorkbenchDataStatisticsFormDTO implements Serializable { private static final long serialVersionUID = -3594409498300008030L; private Long deptId; + + private List deptIdList; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchTopicIssueItemAnalysisFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchTopicIssueItemAnalysisFormDTO.java index e640e19..f6af500 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchTopicIssueItemAnalysisFormDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchTopicIssueItemAnalysisFormDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.analysis.pc.backstage.form; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Author：liuchuang @@ -13,4 +14,6 @@ public class EpdcWorkbenchTopicIssueItemAnalysisFormDTO implements Serializable private static final long serialVersionUID = 400296734298107410L; private Long deptId; + + private List deptIdList; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchUserAnalysisFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchUserAnalysisFormDTO.java index 28acd7e..064aeaf 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchUserAnalysisFormDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchUserAnalysisFormDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.analysis.pc.backstage.form; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Author：liuchuang @@ -13,4 +14,6 @@ public class EpdcWorkbenchUserAnalysisFormDTO implements Serializable { private static final long serialVersionUID = -3866580648194645619L; private Long deptId; + + private List deptIdList; } From 640cecb85d077a2b79d93eed1c928c4e916730fe Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 26 Aug 2021 17:14:01 +0800 Subject: [PATCH 13/34] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E5=A4=A7=E5=B1=8F=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E5=8F=8A=E7=AE=B4=E8=A8=80=20admin=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java index 2f5d908..d447952 100644 --- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java +++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java @@ -57,6 +57,9 @@ public class SysUserDTO implements Serializable { @ApiModelProperty(value = "头像") private String headUrl; + @ApiModelProperty(value = "箴言") + private String proverbs; + @ApiModelProperty(value = "性别 0：男 1：女 2：保密", required = true) @Range(min = 0, max = 2, message = "{sysuser.gender.range}", groups = DefaultGroup.class) private Integer gender; From 1d6413fcf434495db50db44aa5ab23bfe6022ef2 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 26 Aug 2021 17:38:04 +0800 Subject: [PATCH 14/34] =?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 --- .../epdc/dto/DifficultItemOverseeDTO.java | 117 ++++++++++++++++++ .../esua/epdc/dto/RoleDifficultDeptDTO.java | 82 ++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/DifficultItemOverseeDTO.java create mode 100644 epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/RoleDifficultDeptDTO.java diff --git a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/DifficultItemOverseeDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/DifficultItemOverseeDTO.java new file mode 100644 index 0000000..ee00940 --- /dev/null +++ b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/DifficultItemOverseeDTO.java @@ -0,0 +1,117 @@ +/** + * 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-25 + */ +@Data +public class DifficultItemOverseeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 项目ID + */ + private String itemId; + + /** + * 督办人ID + */ + private String overseeUserId; + + /** + * 督办人姓名 + */ + private String overseeUserName; + + /** + * 督办人部门ID + */ + private String overseeDeptId; + + /** + * 督办人部门名称 + */ + private String overseeDeptName; + + /** + * 督办时间 + */ + private Date overseeTime; + + /** + * 督办描述 + */ + private String overseeContent; + + /** + * 被督办人部门ID + */ + private String beOverseeDept; + + /** + * 被督办人部门名称 + */ + private String beOverseeDeptName; + + /** + * 删除标识 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-events-client/src/main/java/com/elink/esua/epdc/dto/RoleDifficultDeptDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/RoleDifficultDeptDTO.java new file mode 100644 index 0000000..d3ad68f --- /dev/null +++ b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/RoleDifficultDeptDTO.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-25 + */ +@Data +public class RoleDifficultDeptDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 标识号 + */ + private String id; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 删除标识 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 c5477cca36554a2c71e89d01e1d87c698f1139dd Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 26 Aug 2021 17:40:59 +0800 Subject: [PATCH 15/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/EpdcWorkbenchSysDeptResultDTO.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchSysDeptResultDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchSysDeptResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchSysDeptResultDTO.java new file mode 100644 index 0000000..e8a9faa --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/result/EpdcWorkbenchSysDeptResultDTO.java @@ -0,0 +1,18 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/26 17:38 + */ +@Data +public class EpdcWorkbenchSysDeptResultDTO implements Serializable { + private static final long serialVersionUID = -6713213984507789567L; + + private Long deptId; + private String deptName; + private String typeKey; +} From 8fcc3a0c139265184db1a7f3ae4e62450ad9bc4e Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 26 Aug 2021 17:48:25 +0800 Subject: [PATCH 16/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EpdcWorkbenchSysDeptFormDTO.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchSysDeptFormDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchSysDeptFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchSysDeptFormDTO.java new file mode 100644 index 0000000..c380e90 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchSysDeptFormDTO.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author：liuchuang + * @Date：2021/8/26 17:47 + */ +@Data +public class EpdcWorkbenchSysDeptFormDTO implements Serializable { + private static final long serialVersionUID = -8375246144010736008L; + + /** + * 部门类型 + */ + private String typeKey; + + /** + * 数据权限 + */ + private List deptIdList; +} From 2db27b1d2259be65162701362c6cb220f4c852ec Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 26 Aug 2021 19:22:22 +0800 Subject: [PATCH 17/34] =?UTF-8?q?=E6=96=B0=E5=A2=9EDTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/RoleOverseeDeptRelationDTO.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleOverseeDeptRelationDTO.java diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleOverseeDeptRelationDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleOverseeDeptRelationDTO.java new file mode 100644 index 0000000..5fd0c7d --- /dev/null +++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/RoleOverseeDeptRelationDTO.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-26 16:57 + **/ +@Data +public class RoleOverseeDeptRelationDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 角色id + */ + private Long id; + + /** + * 督办部门ID列表 + */ + private List overseeMenuIdList; +} \ No newline at end of file From 4cb9f0360afad943b2dc5b117afc40421d54e575 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 26 Aug 2021 19:38:33 +0800 Subject: [PATCH 18/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/EpdcWorkbenchUserAnalysisExcel.java | 30 ++++++++++++ .../excel/EpdcWorkbenchWorkStatusExcel.java | 48 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java new file mode 100644 index 0000000..2455642 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @Author：liuchuang + * @Date：2021/8/26 19:36 + */ +@Data +public class EpdcWorkbenchUserAnalysisExcel { + + /** + * 组织 + */ + @Excel(name = "组织", width = 50) + private String deptName; + + /** + * 用户数量 + */ + @Excel(name = "用户数", width = 30) + private Integer userNum; + + /** + * 党员数量 + */ + @Excel(name = "党员数", width = 30) + private Integer partyMemberNum; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java new file mode 100644 index 0000000..f333047 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @Author：liuchuang + * @Date：2021/8/26 18:25 + */ +@Data +public class EpdcWorkbenchWorkStatusExcel { + + /** + * 组织 + */ + @Excel(name = "组织", width = 50) + private String deptName; + + /** + * 话题数 + */ + @Excel(name = "话题数", width = 30) + private Integer topicNum; + + /** + * 议题数 + */ + @Excel(name = "议题数", width = 30) + private Integer issueNum; + + /** + * 项目数 + */ + @Excel(name = "项目数", width = 30) + private Integer itemNum; + + /** + * 项目结案数 + */ + @Excel(name = "项目结案数", width = 30) + private Integer itemCaseClosedNum; + + /** + * 督办项目数 + */ + @Excel(name = "督办项目数", width = 30) + private Integer superviseItemNum; +} From c6da9c15bdf0c6a0dc0a33d4273c7d6696c63911 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Fri, 27 Aug 2021 09:33:48 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/EpdcWorkbenchDataAnalysisExcel.java | 72 +++++++++++++++++++ ...cWorkbenchTopicIssueItemAnalysisExcel.java | 36 ++++++++++ 2 files changed, 108 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java new file mode 100644 index 0000000..dacad21 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java @@ -0,0 +1,72 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @Author：liuchuang + * @Date：2021/8/27 9:30 + */ +@Data +public class EpdcWorkbenchDataAnalysisExcel { + + /** + * 话题数 + */ + @Excel(name = "话题数", width = 50) + private Integer topicNum; + + /** + * 昨日新增话题数 + */ + @Excel(name = "昨日新增话题数", width = 50) + private Integer topicAddedYesterdayNum; + + /** + * 议题数 + */ + @Excel(name = "议题数", width = 50) + private Integer issueNum; + + /** + * 昨日新增议题数 + */ + @Excel(name = "昨日新增议题数", width = 50) + private Integer issueAddedYesterdayNum; + + /** + * 项目数 + */ + @Excel(name = "项目数", width = 50) + private Integer itemNum; + + /** + * 昨日新增项目数 + */ + @Excel(name = "昨日新增项目数", width = 50) + private Integer itemAddedYesterdayNum; + + /** + * 项目结案数 + */ + @Excel(name = "项目结案数", width = 50) + private Integer itemCaseClosedNum; + + /** + * 昨日新增项目结案数 + */ + @Excel(name = "昨日新增项目结案数", width = 50) + private Integer itemCaseClosedAddedYesterdayNum; + + /** + * 项目督办数 + */ + @Excel(name = "项目督办数", width = 50) + private Integer superviseItemNum; + + /** + * 昨日新增项目督办数 + */ + @Excel(name = "昨日新增项目督办数", width = 50) + private Integer superviseItemAddedYesterdayNum; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java new file mode 100644 index 0000000..761f2cb --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @Author：liuchuang + * @Date：2021/8/27 9:32 + */ +@Data +public class EpdcWorkbenchTopicIssueItemAnalysisExcel { + + /** + * 部门名称 + */ + @Excel(name = "组织", width = 50) + private String deptName; + + /** + * 话题数量 + */ + @Excel(name = "话题数", width = 50) + private Integer topicNum; + + /** + * 议题数量 + */ + @Excel(name = "议题数", width = 50) + private Integer issueNum; + + /** + * 项目数量 + */ + @Excel(name = "项目数", width = 50) + private Integer itemNum; +} From cf36dec7d06b853605c7ddb820e737181eb2ac23 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 27 Aug 2021 14:09:15 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E7=9D=A3=E5=8A=9E=E8=A7=92=E8=89=B2?= 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 523b9c1..ca8501d 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 @@ -92,4 +92,9 @@ public class SysRoleDTO implements Serializable { * 内容栏目ID列表 */ private List moduleMenuIdList; + + /** + * 督办部门ID列表 + */ + private List overseeMenuIdList; } From a87f857cb65f7fc7a32937c714ae520c79f3a67c Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 27 Aug 2021 16:51:31 +0800 Subject: [PATCH 21/34] =?UTF-8?q?=E7=9D=A3=E5=8A=9E=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/pc/item/DifficultItemOverseeDTO.java | 4 ++-- .../pc/item/result/DifficultItemResultDTO.java | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/DifficultItemOverseeDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/DifficultItemOverseeDTO.java index b17bfef..a5bc19b 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/DifficultItemOverseeDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/DifficultItemOverseeDTO.java @@ -40,9 +40,9 @@ public class DifficultItemOverseeDTO implements Serializable { private String id; /** - * 难点堵点ID + * 项目ID */ - private String difficultId; + private String itemId; /** * 督办人ID diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/DifficultItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/DifficultItemResultDTO.java index 8d91b39..fc89bb8 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/DifficultItemResultDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/item/result/DifficultItemResultDTO.java @@ -1,9 +1,11 @@ package com.elink.esua.epdc.dto.analysis.pc.item.result; +import com.elink.esua.epdc.dto.analysis.pc.item.DifficultItemOverseeDTO; import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @Description 疑难项目 @@ -21,6 +23,11 @@ public class DifficultItemResultDTO implements Serializable { * 项目内容 */ private String itemContent; + /** + * 督办状态 + */ + private String overseeName; + /** * 转项目时间 */ @@ -57,4 +64,10 @@ public class DifficultItemResultDTO implements Serializable { * 居民满意度评价 */ private String evaluationScore; + + /** + * 督办记录 + */ + private List overseeList; + } From 42b5581c10bfead207a620de53f657c7d5a86ef7 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Fri, 27 Aug 2021 20:14:21 +0800 Subject: [PATCH 22/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/EpdcWorkbenchDataAnalysisExcel.java | 20 +++++++++---------- ...cWorkbenchTopicIssueItemAnalysisExcel.java | 8 ++++---- .../excel/EpdcWorkbenchUserAnalysisExcel.java | 6 +++--- .../excel/EpdcWorkbenchWorkStatusExcel.java | 12 +++++------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java index dacad21..56a070c 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java @@ -13,60 +13,60 @@ public class EpdcWorkbenchDataAnalysisExcel { /** * 话题数 */ - @Excel(name = "话题数", width = 50) + @Excel(name = "话题数") private Integer topicNum; /** * 昨日新增话题数 */ - @Excel(name = "昨日新增话题数", width = 50) + @Excel(name = "昨日新增话题数") private Integer topicAddedYesterdayNum; /** * 议题数 */ - @Excel(name = "议题数", width = 50) + @Excel(name = "议题数") private Integer issueNum; /** * 昨日新增议题数 */ - @Excel(name = "昨日新增议题数", width = 50) + @Excel(name = "昨日新增议题数") private Integer issueAddedYesterdayNum; /** * 项目数 */ - @Excel(name = "项目数", width = 50) + @Excel(name = "项目数") private Integer itemNum; /** * 昨日新增项目数 */ - @Excel(name = "昨日新增项目数", width = 50) + @Excel(name = "昨日新增项目数") private Integer itemAddedYesterdayNum; /** * 项目结案数 */ - @Excel(name = "项目结案数", width = 50) + @Excel(name = "项目结案数") private Integer itemCaseClosedNum; /** * 昨日新增项目结案数 */ - @Excel(name = "昨日新增项目结案数", width = 50) + @Excel(name = "昨日新增项目结案数") private Integer itemCaseClosedAddedYesterdayNum; /** * 项目督办数 */ - @Excel(name = "项目督办数", width = 50) + @Excel(name = "项目督办数") private Integer superviseItemNum; /** * 昨日新增项目督办数 */ - @Excel(name = "昨日新增项目督办数", width = 50) + @Excel(name = "昨日新增项目督办数") private Integer superviseItemAddedYesterdayNum; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java index 761f2cb..78f0974 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java @@ -13,24 +13,24 @@ public class EpdcWorkbenchTopicIssueItemAnalysisExcel { /** * 部门名称 */ - @Excel(name = "组织", width = 50) + @Excel(name = "组织") private String deptName; /** * 话题数量 */ - @Excel(name = "话题数", width = 50) + @Excel(name = "话题数") private Integer topicNum; /** * 议题数量 */ - @Excel(name = "议题数", width = 50) + @Excel(name = "议题数") private Integer issueNum; /** * 项目数量 */ - @Excel(name = "项目数", width = 50) + @Excel(name = "项目数") private Integer itemNum; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java index 2455642..6cdd634 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java @@ -13,18 +13,18 @@ public class EpdcWorkbenchUserAnalysisExcel { /** * 组织 */ - @Excel(name = "组织", width = 50) + @Excel(name = "组织") private String deptName; /** * 用户数量 */ - @Excel(name = "用户数", width = 30) + @Excel(name = "用户数") private Integer userNum; /** * 党员数量 */ - @Excel(name = "党员数", width = 30) + @Excel(name = "党员数") private Integer partyMemberNum; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java index f333047..ef3de42 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java @@ -13,36 +13,36 @@ public class EpdcWorkbenchWorkStatusExcel { /** * 组织 */ - @Excel(name = "组织", width = 50) + @Excel(name = "组织") private String deptName; /** * 话题数 */ - @Excel(name = "话题数", width = 30) + @Excel(name = "话题数") private Integer topicNum; /** * 议题数 */ - @Excel(name = "议题数", width = 30) + @Excel(name = "议题数") private Integer issueNum; /** * 项目数 */ - @Excel(name = "项目数", width = 30) + @Excel(name = "项目数") private Integer itemNum; /** * 项目结案数 */ - @Excel(name = "项目结案数", width = 30) + @Excel(name = "项目结案数") private Integer itemCaseClosedNum; /** * 督办项目数 */ - @Excel(name = "督办项目数", width = 30) + @Excel(name = "督办项目数") private Integer superviseItemNum; } From 3078162981d685e255bce6f9ef6f95a9728f14f8 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Fri, 27 Aug 2021 21:13:23 +0800 Subject: [PATCH 23/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/EpdcWorkbenchDataAnalysisExcel.java | 20 +++++++++---------- ...cWorkbenchTopicIssueItemAnalysisExcel.java | 8 ++++---- .../excel/EpdcWorkbenchUserAnalysisExcel.java | 6 +++--- .../excel/EpdcWorkbenchWorkStatusExcel.java | 12 +++++------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java index 56a070c..a4938fd 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchDataAnalysisExcel.java @@ -13,60 +13,60 @@ public class EpdcWorkbenchDataAnalysisExcel { /** * 话题数 */ - @Excel(name = "话题数") + @Excel(name = "话题数", width = 10) private Integer topicNum; /** * 昨日新增话题数 */ - @Excel(name = "昨日新增话题数") + @Excel(name = "昨日新增话题数", width = 20) private Integer topicAddedYesterdayNum; /** * 议题数 */ - @Excel(name = "议题数") + @Excel(name = "议题数", width = 10) private Integer issueNum; /** * 昨日新增议题数 */ - @Excel(name = "昨日新增议题数") + @Excel(name = "昨日新增议题数", width = 20) private Integer issueAddedYesterdayNum; /** * 项目数 */ - @Excel(name = "项目数") + @Excel(name = "项目数", width = 10) private Integer itemNum; /** * 昨日新增项目数 */ - @Excel(name = "昨日新增项目数") + @Excel(name = "昨日新增项目数", width = 20) private Integer itemAddedYesterdayNum; /** * 项目结案数 */ - @Excel(name = "项目结案数") + @Excel(name = "项目结案数", width = 10) private Integer itemCaseClosedNum; /** * 昨日新增项目结案数 */ - @Excel(name = "昨日新增项目结案数") + @Excel(name = "昨日新增项目结案数", width = 20) private Integer itemCaseClosedAddedYesterdayNum; /** * 项目督办数 */ - @Excel(name = "项目督办数") + @Excel(name = "项目督办数", width = 10) private Integer superviseItemNum; /** * 昨日新增项目督办数 */ - @Excel(name = "昨日新增项目督办数") + @Excel(name = "昨日新增项目督办数", width = 20) private Integer superviseItemAddedYesterdayNum; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java index 78f0974..38af9c1 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchTopicIssueItemAnalysisExcel.java @@ -13,24 +13,24 @@ public class EpdcWorkbenchTopicIssueItemAnalysisExcel { /** * 部门名称 */ - @Excel(name = "组织") + @Excel(name = "组织", width = 20) private String deptName; /** * 话题数量 */ - @Excel(name = "话题数") + @Excel(name = "话题数", width = 10) private Integer topicNum; /** * 议题数量 */ - @Excel(name = "议题数") + @Excel(name = "议题数", width = 10) private Integer issueNum; /** * 项目数量 */ - @Excel(name = "项目数") + @Excel(name = "项目数", width = 10) private Integer itemNum; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java index 6cdd634..7e0c678 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchUserAnalysisExcel.java @@ -13,18 +13,18 @@ public class EpdcWorkbenchUserAnalysisExcel { /** * 组织 */ - @Excel(name = "组织") + @Excel(name = "组织", width = 20) private String deptName; /** * 用户数量 */ - @Excel(name = "用户数") + @Excel(name = "用户数", width = 10) private Integer userNum; /** * 党员数量 */ - @Excel(name = "党员数") + @Excel(name = "党员数", width = 10) private Integer partyMemberNum; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java index ef3de42..d77d0b3 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/excel/EpdcWorkbenchWorkStatusExcel.java @@ -13,36 +13,36 @@ public class EpdcWorkbenchWorkStatusExcel { /** * 组织 */ - @Excel(name = "组织") + @Excel(name = "组织", width = 20) private String deptName; /** * 话题数 */ - @Excel(name = "话题数") + @Excel(name = "话题数", width = 10) private Integer topicNum; /** * 议题数 */ - @Excel(name = "议题数") + @Excel(name = "议题数", width = 10) private Integer issueNum; /** * 项目数 */ - @Excel(name = "项目数") + @Excel(name = "项目数", width = 10) private Integer itemNum; /** * 项目结案数 */ - @Excel(name = "项目结案数") + @Excel(name = "项目结案数", width = 10) private Integer itemCaseClosedNum; /** * 督办项目数 */ - @Excel(name = "督办项目数") + @Excel(name = "督办项目数", width = 10) private Integer superviseItemNum; } From b90f4f13b7746f495791afe0d43df649a12d7413 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Fri, 27 Aug 2021 22:09:19 +0800 Subject: [PATCH 24/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EpdcWorkbenchExportFormDTO.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchExportFormDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchExportFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchExportFormDTO.java new file mode 100644 index 0000000..82ab950 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchExportFormDTO.java @@ -0,0 +1,17 @@ +package com.elink.esua.epdc.dto.analysis.pc.backstage.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/27 22:08 + */ +@Data +public class EpdcWorkbenchExportFormDTO implements Serializable { + private static final long serialVersionUID = 1590315319035328972L; + + private Long deptId; + private String dateType; +} From 7d1061fc90b9fed21f378b864c65a19a008df6d5 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Fri, 27 Aug 2021 22:12:14 +0800 Subject: [PATCH 25/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/pc/backstage/form/EpdcWorkbenchExportFormDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchExportFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchExportFormDTO.java index 82ab950..049133f 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchExportFormDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/backstage/form/EpdcWorkbenchExportFormDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.analysis.pc.backstage.form; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Author：liuchuang @@ -14,4 +15,5 @@ public class EpdcWorkbenchExportFormDTO implements Serializable { private Long deptId; private String dateType; + private List deptIdList; } From 7c75592d55757f88e2f471433c5d870e146f98ac Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Sat, 28 Aug 2021 15:14:39 +0800 Subject: [PATCH 26/34] =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=A6=86=E5=B1=B1?= =?UTF-8?q?=EF=BC=9APC=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpdcWorkLogOrgActRecordsResultDTO.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcWorkLogOrgActRecordsResultDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcWorkLogOrgActRecordsResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcWorkLogOrgActRecordsResultDTO.java new file mode 100644 index 0000000..3fadd99 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcWorkLogOrgActRecordsResultDTO.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/28 14:57 + */ +@Data +public class EpdcWorkLogOrgActRecordsResultDTO implements Serializable { + + private static final long serialVersionUID = -6843354413370545958L; + /** + *部门ID + */ + private String deptId; + + /** + *部门名称 + */ + private String deptName; + + /** + *主题党日活动次数 + */ + private Integer actZtdrNum; + + /** + *三会一课活动次数 + */ + private Integer actShykNum; + + /** + *联建共建活动次数 + */ + private Integer actLjgjNum; + + /** + *主题党日参与人数 + */ + private Integer actZtdrPersonNum; + + /** + *三会一课参与人数 + */ + private Integer actShykPersonNum; + + /** + *联建共建参与人数 + */ + private Integer actLjgjPersonNum; +} From b5b1544788ce9a98b329c0857496c32424e7dd63 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Sat, 28 Aug 2021 18:50:42 +0800 Subject: [PATCH 27/34] =?UTF-8?q?DTO=20=E9=85=8D=E7=BD=AE=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java index 99be2f9..25f683e 100644 --- a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java +++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -136,4 +137,9 @@ public class PointsLogsDTO implements Serializable { */ private String volunteerId; + /** + * 是否操作成功(0-失败，1-成功) + */ + private String status; + } \ No newline at end of file From 314c6d81043bd54bb0b12d9240d6eeea934f5ce5 Mon Sep 17 00:00:00 2001 From: rongchao Date: Sat, 28 Aug 2021 18:55:57 +0800 Subject: [PATCH 28/34] =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/HouseHeadRelationConstant.java | 17 + .../esua/epdc/constant/HouseUseConstant.java | 15 + .../epdc/constant/PopulationDictConstant.java | 57 ++++ .../epdc/constant/PopulationIdentify.java | 19 ++ .../esua/epdc/dto/OrganizationModifyDTO.java | 37 +++ .../BasePopulationInformationExportDto.java | 121 +++++++ .../BaseResidentInformationExportDto.java | 47 +++ .../esua/epdc/dto/house/FamilyMember.java | 25 ++ .../epdc/dto/house/HouseBusinessInfoDTO.java | 102 ++++++ .../esua/epdc/dto/house/HouseRentInfoDTO.java | 92 ++++++ .../esua/epdc/dto/house/HouseResidentDTO.java | 144 +++++++++ .../esua/epdc/dto/house/HousingInfo.java | 36 +++ .../epdc/dto/house/HousingInformationDTO.java | 184 +++++++++++ .../dto/house/PopulationInfoOverviewDTO.java | 74 +++++ .../dto/house/PopulationInformationDTO.java | 299 ++++++++++++++++++ .../dto/house/SysPopulationSimpleDictDTO.java | 29 ++ .../esua/epdc/dto/house/SysSimpleDictDTO.java | 37 +++ .../form/EpdcScreenGridRankingFormDTO.java | 34 ++ .../EpdcScreenHouseInfoByPeopleFormDTO.java | 36 +++ ...pdcScreenPopulationInfoByHouseFormDTO.java | 37 +++ ...enResidentInfoByCurrentAddressFormDTO.java | 39 +++ .../EpdcScreenSelectPeopleDetailFormDTO.java | 24 ++ .../form/EpdcScreenSelectPeopleFormDTO.java | 43 +++ .../form/SysPopulationSimpleDictFormDTO.java | 26 ++ .../result/EpdcPopulationErrorResultDTO.java | 30 ++ .../EpdcScreenGridRankingResultDTO.java | 20 ++ .../EpdcScreenHouseInfoByPeopleResultDTO.java | 37 +++ .../result/EpdcScreenHouseUseResultDTO.java | 58 ++++ ...cScreenPopulationInfoByHouseResultDTO.java | 37 +++ ...ResidentInfoByCurrentAddressResultDTO.java | 45 +++ ...EpdcScreenSelectPeopleDetailResultDTO.java | 64 ++++ .../EpdcScreenSelectPeopleResultDTO.java | 32 ++ 32 files changed, 1897 insertions(+) create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/HouseHeadRelationConstant.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/HouseUseConstant.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationDictConstant.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationIdentify.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/OrganizationModifyDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/BasePopulationInformationExportDto.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/BaseResidentInformationExportDto.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/FamilyMember.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseBusinessInfoDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseRentInfoDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseResidentDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HousingInfo.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HousingInformationDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInfoOverviewDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysPopulationSimpleDictDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysSimpleDictDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenGridRankingFormDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenHouseInfoByPeopleFormDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenPopulationInfoByHouseFormDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenSelectPeopleDetailFormDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenSelectPeopleFormDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/SysPopulationSimpleDictFormDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcPopulationErrorResultDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenGridRankingResultDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenHouseInfoByPeopleResultDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenHouseUseResultDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenPopulationInfoByHouseResultDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenResidentInfoByCurrentAddressResultDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenSelectPeopleDetailResultDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenSelectPeopleResultDTO.java diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/HouseHeadRelationConstant.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/HouseHeadRelationConstant.java new file mode 100644 index 0000000..62fc8d5 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/HouseHeadRelationConstant.java @@ -0,0 +1,17 @@ +package com.elink.esua.epdc.constant; + +/** + * @author: songyunpeng + * @Date: 2020/08/19 14:12 + * @Description: 房屋用处 + */ +public interface HouseHeadRelationConstant { + + String CHILDREN = "0"; + + String HUSBAND_AND_WIFE = "1"; + + String PARENT = "2"; + + String OTHER = "3"; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/HouseUseConstant.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/HouseUseConstant.java new file mode 100644 index 0000000..e3f4e5f --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/HouseUseConstant.java @@ -0,0 +1,15 @@ +package com.elink.esua.epdc.constant; + +/** + * @author: songyunpeng + * @Date: 2020/08/19 14:12 + * @Description: 房屋用处 + */ +public interface HouseUseConstant { + + String SINCE_THE_LIVING = "0"; + + String RENT = "1"; + + String BUSINESS = "2"; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationDictConstant.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationDictConstant.java new file mode 100644 index 0000000..50226d8 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationDictConstant.java @@ -0,0 +1,57 @@ +package com.elink.esua.epdc.constant; + +/** + * @author: songyunpeng + * @Date: 2020/08/19 14:12 + * @Description: 房屋用处 + */ +public interface PopulationDictConstant { + + /** + * 政治面貌 + */ + String POLITICS_STATUS = "politics_status"; + /** + * 文化程度 + */ + String EDUCATION_LEVEL = "education_level"; + /** + * 身体状况 + */ + String BODY_STATUS = "body_status"; + /** + * 婚姻状况 + */ + String MARITAL_STATUS = "marital_status"; + /** + * 户口类型 + */ + String ACCOUNT_TYPE = "account_type"; + /** + * 就业情况 + */ + String EMPLOYMENT_STATUS = "employment_status"; + /** + * 失业原因 + */ + String UNEMPLOYMENT_REASON = "unemployment_reason"; + /** + * 家庭类别 + */ + String FAMILY_CATEGORY = "family_category"; + /** + * 救助情况 + */ + String HELP_STATUS = "help_status"; + /** + * 机动车类型 + */ + String MOTOR_VEHICLE_CATEGORY = "motor_vehicle_category"; + + /** + * 性别 + */ + String GENDER = "gender"; + + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationIdentify.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationIdentify.java new file mode 100644 index 0000000..958a02a --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/constant/PopulationIdentify.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.constant; + +/** + * @author songyunpeng + * @Description 人口信息 人口身份标识 + * @create 2020-09-14 + */ + +public interface PopulationIdentify { + + + String PROPERTY_OWNER = "0"; + + String HOUSE_HEAD = "1"; + + String HOUSE_RESIDENT = "2"; + + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/OrganizationModifyDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/OrganizationModifyDTO.java new file mode 100644 index 0000000..0375280 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/OrganizationModifyDTO.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * + * 组织机构信息修改-接收MQ消息DTO + * + * @Author：liuchuang + * @Date：2020/3/6 22:34 + */ +@Data +public class OrganizationModifyDTO implements Serializable { + + private static final long serialVersionUID = -6534846437298229554L; + /** + * 部门ID + */ + private Long deptId; + + /** + * 旧部门名称 + */ + private String oldDeptName; + + /** + * 新部门名称 + */ + private String newDeptName; + + /** + * 部门类型 + */ + private String typeKey; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/BasePopulationInformationExportDto.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/BasePopulationInformationExportDto.java new file mode 100644 index 0000000..f8a3052 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/BasePopulationInformationExportDto.java @@ -0,0 +1,121 @@ +/** + * 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.house; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 人口信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class BasePopulationInformationExportDto { + + private String id; + + private String gridName; + + private String houseAddress; + + private String buyingTime; + + private BigDecimal houseArea; + + private String propertyOwner; + + private String propertyOwnerIdentityNo; + + private String propertyOwnerCard; + + private String propertyOwnerMobile; + + private String houseUse; + + private String tenantName; + + private String tenantPhone; + + private String tenantIdentityNo; + + private String enterpriseName; + + private String socialUniformCode; + + private String legalRepresentative; + + private String enterprisePhone; + + private String residentsName; + + private String residentsSex; + + private String residentsBirthday; + + private String residentsNation; + + private String educationLevel; + + private String politicsStatus; + + private String joinTime; + + private String organizationalRelationshipLocation; + + private String residentsIdentityNo; + + private String residentsPhone; + + private String bodyStatus; + + private String maritalStatus; + + private String accountType; + + private String militaryService; + + private String householdRegistrationPlace; + + private String employmentStatus; + + private String currentEmployer; + + private String currentEmployerAddress; + + private String unemploymentReason; + + private String reemploymentPermit; + + private String unemploymentRegister; + + private String unemploymentRegisterTime; + + private String familyCategory; + + private String helpStatus; + + private Integer motorVehicleNum; + + private String motorVehicleCategory; + + private String dogStatus; + +} \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/BaseResidentInformationExportDto.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/BaseResidentInformationExportDto.java new file mode 100644 index 0000000..daa7780 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/BaseResidentInformationExportDto.java @@ -0,0 +1,47 @@ +/** + * 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.house; + +import lombok.Data; + +/** + * 人口信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class BaseResidentInformationExportDto { + + private String houseHeadName; + + private String residentsIdentityNo; + + private String houseHeadRelation; + + private String residentsName; + + private String residentsSex; + + private String residentsNation; + + private String currentEmployer; + + private String currentAddress; + +} \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/FamilyMember.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/FamilyMember.java new file mode 100644 index 0000000..8e83124 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/FamilyMember.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.dto.house; + +import lombok.Data; + +/** + * @author songyunpeng + * @Description 大屏找人详情接口 家庭成员信息 + * @create 2020-09-14 + */ +@Data +public class FamilyMember { + /** + * 姓名 + */ + private String name; + /** + * 关系 + */ + private String relation; + /** + * 居住地 + */ + private String currentAddress; + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseBusinessInfoDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseBusinessInfoDTO.java new file mode 100644 index 0000000..b6bf248 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseBusinessInfoDTO.java @@ -0,0 +1,102 @@ +/** + * 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.house; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 房屋经营信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class HouseBusinessInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 企业名称 + */ + private String enterpriseName; + + /** + * 社会统一代码 + */ + private String socialUniformCode; + + /** + * 法人代表 + */ + private String legalRepresentative; + + /** + * 电话 + */ + private String enterprisePhone; + + /** + * 房屋ID + */ + private String houseId; + + /** + * 删除标识 (0：否 1：是) + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 辖区范围 + */ + private String gridName; + +} \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseRentInfoDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseRentInfoDTO.java new file mode 100644 index 0000000..16f7d7f --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseRentInfoDTO.java @@ -0,0 +1,92 @@ +/** + * 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.house; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 房屋租赁信息 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class HouseRentInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 承租人姓名 + */ + private String tenantName; + + /** + * 承租人电话 + */ + private String tenantPhone; + + /** + * 承租人身份证号 + */ + private String tenantIdentityNo; + + /** + * 房屋ID + */ + private String houseId; + + /** + * 删除标识 + */ + 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-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseResidentDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseResidentDTO.java new file mode 100644 index 0000000..90da772 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HouseResidentDTO.java @@ -0,0 +1,144 @@ +/** + * 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.house; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 房屋人员关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class HouseResidentDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 房屋ID + */ + private String houseId; + /** + * 户主ID + */ + private String houseHeadId; + + /** + * 居民ID + */ + private String residentId; + + /** + * 与户主关系 (0：子女 1：夫妻 2：其他) + */ + private String houseHeadRelation; + + /** + * 是否为户主 (0：否 1：是) + */ + private String isHouseHead; + + /** + * 删除标识 (0：否 1：是) + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 姓名 + */ + private String residentsName; + + /** + * 性别 (0：女 1：男) + */ + private String residentsSex; + + /** + * 民族 + */ + private String residentsNation; + /** + * 文化程度 + */ + private String educationLevel; + + /** + * 政治面貌 (0：群众 1：党员) + */ + private String politicsStatus; + /** + * 身份证号码 + */ + private String residentsIdentityNo; + + /** + * 联系电话 + */ + private String residentsPhone; + + /** + * 现工作单位 + */ + private String currentEmployer; + + /** + * 现居住地址- 保存居住人使用 + */ + private String currentAddress; + + /** + * 确认是否修改居住人信息 + */ + private String isEditResidentInfo; + +} \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HousingInfo.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HousingInfo.java new file mode 100644 index 0000000..328562b --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HousingInfo.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.dto.house; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author songyunpeng + * @Description 大屏详情接口 房屋信息 + * @create 2020-09-14 + */ +@Data +public class HousingInfo { + + /** + * 房屋地址 + */ + private String houseAddress; + /** + * 房屋面积 + */ + private BigDecimal houseArea; + /** + * 房屋用途 + */ + private String houseUse; + /** + * 产权人 + */ + private String propertyOwner; + /** + * 产权人电话 + */ + private String propertyOwnerMobile; + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HousingInformationDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HousingInformationDTO.java new file mode 100644 index 0000000..cd651d4 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/HousingInformationDTO.java @@ -0,0 +1,184 @@ +/** + * 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.house; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 房屋信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class HousingInformationDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 房屋地址 + */ + private String houseAddress; + + /** + * 购房时间 + */ + private String buyingTime; + + /** + * 房屋面积 + */ + private BigDecimal houseArea; + + /** + * 产权人 + */ + private String propertyOwner; + + /** + * 产权人身份证号 + */ + private String propertyOwnerIdentityNo; + + /** + * 联系电话 + */ + private String propertyOwnerMobile; + + /** + * 产权证 + */ + private String propertyOwnerCard; + + /** + * 房屋用途 (0：自住 1：租赁 2：经营) + */ + private String houseUse; + + /** + * 删除标识 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 所属网格ID + */ + private Long gridId; + + /** + * 父所有部门 + */ + private String parentDeptIds; + + /** + * 父所有部门名称 + */ + private String parentDeptNames; + + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; + + /** + * 承租人姓名 + */ + private String tenantName; + + /** + * 承租人电话 + */ + private String tenantPhone; + + /** + * 承租人身份证号 + */ + private String tenantIdentityNo; + + + /** + * 企业名称 + */ + private String enterpriseName; + + /** + * 社会统一代码 + */ + private String socialUniformCode; + + /** + * 法人代表 + */ + private String legalRepresentative; + + /** + * 电话 + */ + private String enterprisePhone; + + /** + * 网格名 + */ + private String gridName; + /** + * 部门回显 + */ + private List deptIdList; + + +} \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInfoOverviewDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInfoOverviewDTO.java new file mode 100644 index 0000000..320b17d --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInfoOverviewDTO.java @@ -0,0 +1,74 @@ +/** + * 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.house; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 居民信息统计数据 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class PopulationInfoOverviewDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 自住数量 + */ + private Integer sinceTheLiving; + /** + * 租赁数量 + */ + private Integer rent; + /** + * 经营数量 + */ + private Integer business; + /** + * 在岗数量 + */ + private Integer employment; + /** + * 失业数量 + */ + private Integer unemployment; + /** + * 房屋数量 + */ + private Integer houseNum; + /** + * 人口数量 + */ + private Integer populationNum; + /** + * 机动车数量 + */ + private Integer motorVehicleNum; + /** + * 党员 + */ + private Integer partyMemberNum; + + + +} \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java new file mode 100644 index 0000000..d4f30e3 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java @@ -0,0 +1,299 @@ +/** + * 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.house; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 人口信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class PopulationInformationDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 姓名 + */ + private String residentsName; + + /** + * 性别 (0：女 1：男) + */ + private String residentsSex; + + /** + * 民族 + */ + private String residentsNation; + + /** + * 出生年/月 + */ + private Date residentsBirthday; + + /** + * 文化程度 + */ + private String educationLevel; + + /** + * 政治面貌 (0：群众 1：党员) + */ + private String politicsStatus; + + /** + * 入党时间 + */ + private String joinTime; + + /** + * 组织关系所在地 + */ + private String organizationalRelationshipLocation; + + /** + * 身份证号码 + */ + private String residentsIdentityNo; + + /** + * 联系电话 + */ + private String residentsPhone; + + /** + * 身体状况 (0：病残 1：健康) + */ + private String bodyStatus; + + /** + * 婚姻状况 (0：未婚 1：已婚) + */ + private String maritalStatus; + + /** + * 户口类型 (0：城镇 1：农业) + */ + private String accountType; + + /** + * 服兵役 (0：否 1：是) + */ + private String militaryService; + + /** + * 户籍地 + */ + private String householdRegistrationPlace; + + /** + * 就业情况 (0：在岗 1：就业) + */ + private String employmentStatus; + + /** + * 现工作单位 + */ + private String currentEmployer; + + /** + * 现单位地址 + */ + private String currentEmployerAddress; + + /** + * 失业原因 (0：原单位破产 1：解除合同 2：效益不好 3：减员 4：其他) + */ + private String unemploymentReason; + + /** + * 再就业优惠证 (0：无 1：有) + */ + private String reemploymentPermit; + + /** + * 失业登记 (0：否 1：是) + */ + private String unemploymentRegister; + + /** + * 失业登记时间 + */ + private String unemploymentRegisterTime; + + /** + * 家庭类别 (0：普通家庭 1：五好家庭 2：军烈家庭 3：优抚家庭 4：单亲家庭 5：空巢老人 6：困难家庭) + */ + private String familyCategory; + + /** + * 救助情况 (0：低保 1：大病 2：廉租 3：教育 4：临时 5：其他) + */ + private String helpStatus; + + /** + * 机动车数量 + */ + private Integer motorVehicleNum; + + /** + * 机动车类型 (0：轿车 1：摩托 2：其他) + */ + private String motorVehicleCategory; + + /** + * 宠物犬状况 (0：无 1：有) + */ + private String dogStatus; + + /** + * 家庭成员数 + */ + private Integer familyMemberNum; + + /** + * 家庭外出成员数 + */ + private Integer familyMemberOutNum; + + /** + * 外出原因 (0：务工 1：上学 2：探亲 3：其他) + */ + private String familyMemberOutReason; + + /** + * 在外月数 + */ + private Integer familyMemberOutMonth; + + /** + * 删除标识 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 现居住地址- 保存居住人使用 + */ + private String currentAddress; + /** + * 与户主关系 + */ + private String houseHeadRelation; + + /** + * 居住人ID + */ + private String residentId; + /** + * 户主ID + */ + private String houseHeadId; + /** + * 房屋ID + */ + private String houseId; + /** + * 户主编辑是否确认提交字段 + */ + private String isSubmit; + + + //人口信息显示字段 + + List housingInformationList; + + /** + * 所属部门名字 ,隔开 + */ + private String gridNames; + + /** + * 房屋地址 ,隔开 + */ + private String houseAddress; + + + /** + * 机动车类型 - 辅助前台显示 + */ + private List motorVehicleCategoryList; + + /** + * 核酸检测状态：0已检测 1未检测 + */ + private String checkState; + + /** + * 核酸检测时间 + */ + @JSONField(format = "yyyy-MM-dd") + private Date checkDate; + + /** + * 接种次数 + */ + private Integer vaccinationNum; + + /** + * 接种状态 0未接种 1接种中 2接种完成 + */ + private String vaccinationState; + +} \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysPopulationSimpleDictDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysPopulationSimpleDictDTO.java new file mode 100644 index 0000000..828f801 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysPopulationSimpleDictDTO.java @@ -0,0 +1,29 @@ + +package com.elink.esua.epdc.dto.house; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 数据字典简要信息 + * + * @author songyunpeng + * @date 2020/8/31 09:29 + */ +@Data +public class SysPopulationSimpleDictDTO implements Serializable { + + private static final long serialVersionUID = -4827806651372425347L; + + /** + * 键 + */ + private String dicType; + /** + * 字典列表 + */ + private List sysSimpleDicts; + +} \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysSimpleDictDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysSimpleDictDTO.java new file mode 100644 index 0000000..f38607b --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysSimpleDictDTO.java @@ -0,0 +1,37 @@ + +package com.elink.esua.epdc.dto.house; + +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 数据字典简要信息 + * + * @author yujintao + * @date 2019/7/15 09:29 + */ +@Data +public class SysSimpleDictDTO implements Serializable { + + private static final long serialVersionUID = -4827806651372425347L; + + /** + * 字典名称 + */ + @NotBlank(message = "{sysdict.name.require}", groups = DefaultGroup.class) + private String dictName; + + /** + * 字典值 + */ + private String dictValue; + + /** + * 备注 + */ + private String remark; + +} \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenGridRankingFormDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenGridRankingFormDTO.java new file mode 100644 index 0000000..88b1417 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenGridRankingFormDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.house.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + +/** + * @author songyunpeng + * @Description 大屏网格排名参数 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenGridRankingFormDTO { + + /** + * 页码 + */ + @Min(value = 0, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 0, message = "页容量必须大于0") + private Integer pageSize; + + /** + * 排序依据 + */ + @NotBlank(message = "排序依据不能为空") + private String rankCategory; + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenHouseInfoByPeopleFormDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenHouseInfoByPeopleFormDTO.java new file mode 100644 index 0000000..9e01b18 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenHouseInfoByPeopleFormDTO.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.dto.house.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + +/** + * @author songyunpeng + * @Description 大屏以人找房参数 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenHouseInfoByPeopleFormDTO { + + /** + * 页码 + */ + @Min(value = 0, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 0, message = "页容量必须大于0") + private Integer pageSize; + + /** + * 户主姓名 + */ + @NotBlank(message = "户主姓名不能为空") + private String houseHeadName; + + private String communityId; + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenPopulationInfoByHouseFormDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenPopulationInfoByHouseFormDTO.java new file mode 100644 index 0000000..2da6beb --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenPopulationInfoByHouseFormDTO.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.dto.house.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + +/** + * @author songyunpeng + * @Description 大屏以房找人参数 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenPopulationInfoByHouseFormDTO { + + /** + * 页码 + */ + @Min(value = 0, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 0, message = "页容量必须大于0") + private Integer pageSize; + + /** + * 房屋地址 + */ + @NotBlank(message = "房屋地址不能为空") + private String houseAddress; + + + private String communityId; + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java new file mode 100644 index 0000000..66848a0 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java @@ -0,0 +1,39 @@ +package com.elink.esua.epdc.dto.house.form; + +import lombok.Data; + +import javax.validation.constraints.Min; + +/** + * @author songyunpeng + * @Description 大屏以人找人参数 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenResidentInfoByCurrentAddressFormDTO { + + /** + * 页码 + */ + @Min(value = 0, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 0, message = "页容量必须大于0") + private Integer pageSize; + + /** + * 当前居住地址 + */ + private String currentAddress; + /** + * 居住人姓名 + */ + private String residentName; + + + private String communityId; + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenSelectPeopleDetailFormDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenSelectPeopleDetailFormDTO.java new file mode 100644 index 0000000..202ca89 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenSelectPeopleDetailFormDTO.java @@ -0,0 +1,24 @@ +package com.elink.esua.epdc.dto.house.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author songyunpeng + * @Description 大屏找人接口详情参数 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenSelectPeopleDetailFormDTO { + + /** + * 人口ID + */ + private String populationId; + /** + * 身份标识 + */ + @NotBlank(message = "身份标识不能为空") + private String identifyFlag; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenSelectPeopleFormDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenSelectPeopleFormDTO.java new file mode 100644 index 0000000..9484ade --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/EpdcScreenSelectPeopleFormDTO.java @@ -0,0 +1,43 @@ +package com.elink.esua.epdc.dto.house.form; + +import lombok.Data; + +import javax.validation.constraints.Min; + +/** + * @author songyunpeng + * @Description 大屏找人接口参数 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenSelectPeopleFormDTO { + + /** + * 页码 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 1, message = "页容量必须大于0") + private Integer pageSize; + + /** + * 姓名 + */ + private String name; + /** + * 社区ID + */ + private String communityId; + /** + * 电话 + */ + private String phone; + /** + * 网格ID + */ + private String gridId; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/SysPopulationSimpleDictFormDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/SysPopulationSimpleDictFormDTO.java new file mode 100644 index 0000000..b160245 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/form/SysPopulationSimpleDictFormDTO.java @@ -0,0 +1,26 @@ + +package com.elink.esua.epdc.dto.house.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 数据字典简要信息 + * + * @author songyunpeng + * @date 2020/8/31 09:29 + */ +@Data +public class SysPopulationSimpleDictFormDTO implements Serializable { + + private static final long serialVersionUID = -4827806651372425347L; + + /** + * type列表 + */ + private List dicTypes; + + +} \ No newline at end of file diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcPopulationErrorResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcPopulationErrorResultDTO.java new file mode 100644 index 0000000..3241940 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcPopulationErrorResultDTO.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.dto.house.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author: songyunpeng + * @Date: 2020/8/31 17:06 + * @Description: 批量导入居民信息错误反馈 + */ +@Data +public class EpdcPopulationErrorResultDTO implements Serializable { + + private static final long serialVersionUID = 5643743407138967806L; + + /** + * 错误数据sheet名 + */ + private String sheetName; + /** + * 错误数据行数 + */ + private String errorLine; + + /** + * 错误数据信息 + */ + private String errorInfo; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenGridRankingResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenGridRankingResultDTO.java new file mode 100644 index 0000000..064247e --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenGridRankingResultDTO.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.dto.house.result; + +import lombok.Data; + +/** + * @author songyunpeng + * @Description 大屏房屋用途接口结果 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenGridRankingResultDTO { + /** + * 网格名 + */ + private String gridName; + /** + * 数量 + */ + private Integer total; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenHouseInfoByPeopleResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenHouseInfoByPeopleResultDTO.java new file mode 100644 index 0000000..4e5f76b --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenHouseInfoByPeopleResultDTO.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.dto.house.result; + +import lombok.Data; + +/** + * @author songyunpeng + * @Description 大屏以人找房结果 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenHouseInfoByPeopleResultDTO { + /** + * ID + */ + private String populationId; + /** + * 身份标识 + */ + private String identityFlag; + /** + * 户主姓名 + */ + private String houseHeadName; + /** + * 网格名称 + */ + private String gridName; + /** + * 房屋地址 + */ + private String houseAddress; + /** + * 户主联系电话 + */ + private String houseHeadPhone; + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenHouseUseResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenHouseUseResultDTO.java new file mode 100644 index 0000000..d32a0ce --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenHouseUseResultDTO.java @@ -0,0 +1,58 @@ +package com.elink.esua.epdc.dto.house.result; + +import lombok.Data; + +/** + * @author songyunpeng + * @Description 大屏房屋用途接口结果 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenHouseUseResultDTO { + /** + * 房屋数量 + */ + private Integer houseNum; + /** + * 人口数量 + */ + private Integer populationNum; + /** + * 机动车数量 + */ + private Integer motorVehicleNum; + /** + * 党员 + */ + private Integer partyMemberNum; + /** + * 企业数量 + */ + private Integer enterpriseNum; + /** + * 租赁数量 + */ + private Integer rentNumber; + /** + * 自住数量 + */ + private Integer sinceTheLivingNumber; + /** + * 经营数量 + */ + private Integer businessNumber; + /** + * 租赁百分比 + */ + private Integer rentPercent; + /** + * 自住百分比 + */ + private Integer sinceTheLivingNumberPercent; + /** + * 经营百分比 + */ + private Integer businessPercent; + + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenPopulationInfoByHouseResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenPopulationInfoByHouseResultDTO.java new file mode 100644 index 0000000..78a5c27 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenPopulationInfoByHouseResultDTO.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.dto.house.result; + +import lombok.Data; + +/** + * @author songyunpeng + * @Description 大屏以房找人结果 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenPopulationInfoByHouseResultDTO { + /** + * ID + */ + private String populationId; + /** + * 身份标识 + */ + private String identityFlag; + /** + * 户主姓名 + */ + private String houseHeadName; + /** + * 网格名称 + */ + private String gridName; + /** + * 房屋地址 + */ + private String houseAddress; + /** + * 户主联系电话 + */ + private String houseHeadPhone; + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenResidentInfoByCurrentAddressResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenResidentInfoByCurrentAddressResultDTO.java new file mode 100644 index 0000000..827b983 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenResidentInfoByCurrentAddressResultDTO.java @@ -0,0 +1,45 @@ +package com.elink.esua.epdc.dto.house.result; + +import lombok.Data; + +/** + * @author songyunpeng + * @Description 大屏以人找人结果 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenResidentInfoByCurrentAddressResultDTO { + /** + * ID + */ + private String populationId; + /** + * 身份标识 + */ + private String identityFlag; + + /** + * 居住人姓名 + */ + private String residentName; + /** + * 当前居住地址 + */ + private String currentAddress; + /** + * 户主姓名 + */ + private String houseHeadName; + /** + * 户主电话 + */ + private String houseHeadPhone; + /** + * 户主居住地址 + */ + private String houseHeadAddress; + + + + +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenSelectPeopleDetailResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenSelectPeopleDetailResultDTO.java new file mode 100644 index 0000000..2633f31 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenSelectPeopleDetailResultDTO.java @@ -0,0 +1,64 @@ +package com.elink.esua.epdc.dto.house.result; + +import com.elink.esua.epdc.dto.house.FamilyMember; +import com.elink.esua.epdc.dto.house.HousingInfo; +import lombok.Data; + +import java.util.List; + +/** + * @author songyunpeng + * @Description 大屏找人详情接口结果 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenSelectPeopleDetailResultDTO { + /** + * 姓名 + */ + private String name; + /** + * 性别 + */ + private String sex; + /** + * 年龄 + */ + private String age; + /** + * 电话 + */ + private String phone; + /** + * 家庭类别 + */ + private String familyCategory; + /** + * 就业情况 + */ + private String employmentStatus; + /** + * 文化程度 + */ + private String educationLevel; + /** + * 政治面貌 + */ + private String politicsStatus; + /** + * 机动车数量 + */ + private String motorVehicleNum; + /** + * 宠物犬状况 + */ + private String dogStatus; + /** + * 房屋信息 + */ + List housingInfo; + /** + * 家庭成员信息 + */ + List familyMember; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenSelectPeopleResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenSelectPeopleResultDTO.java new file mode 100644 index 0000000..d73cec7 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcScreenSelectPeopleResultDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.house.result; + +import lombok.Data; + +/** + * @author songyunpeng + * @Description 大屏找人接口结果 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenSelectPeopleResultDTO { + /** + * 姓名 + */ + private String name; + /** + * 网格名 + */ + private String gridName; + /** + * 身份 + */ + private String identityName; + /** + * 身份标识 + */ + private String identityFlag; + /** + * 居民ID + */ + private String populationId; +} From 08dee99948b802d56330dec09753968920686ddd Mon Sep 17 00:00:00 2001 From: Jackwang Date: Sat, 28 Aug 2021 19:07:15 +0800 Subject: [PATCH 29/34] =?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 --- .../esua/epdc/volunteer/VolunteerDTO.java | 146 ++++++++++++++++++ .../esua/epdc/volunteer/VolunteerOrgDTO.java | 106 +++++++++++++ .../volunteer/VolunteerOrgRelationDTO.java | 82 ++++++++++ 3 files changed, 334 insertions(+) create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerDTO.java create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerOrgDTO.java create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerOrgRelationDTO.java diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerDTO.java new file mode 100644 index 0000000..eda0ab9 --- /dev/null +++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerDTO.java @@ -0,0 +1,146 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.volunteer; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 志愿者信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-28 + */ +@Data +public class VolunteerDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idcard; + + /** + * 电话 + */ + private String mobile; + + /** + * 自我介绍 + */ + private String describe; + + /** + * 认证状态：0审核中 1审核通过 2审核驳回 + */ + private String state; + + /** + * 审核理由 + */ + private String reason; + + /** + * 用户ID + */ + private String userId; + + /** + * 头像地址 + */ + private String url; + + /** + * 党员标识：0否1是 + */ + private String partyFlag; + + /** + * 部门ID + */ + private String deptId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; + + /** + * 父所有部门 + */ + private String parentDeptIds; + + /** + * 父所有部门 + */ + private String parentDeptNames; + + /** + * 删除标识 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-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerOrgDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerOrgDTO.java new file mode 100644 index 0000000..a356ae9 --- /dev/null +++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerOrgDTO.java @@ -0,0 +1,106 @@ +/** + * 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.volunteer; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 志愿者组织 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-28 + */ +@Data +public class VolunteerOrgDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 组织名称 + */ + private String volunteerOrgName; + + /** + * 组织编码 + */ + private String volunteerOrgCode; + + /** + * 是否启用：0启用 1禁用 + */ + private String isOpen; + + /** + * 排序 + */ + private Integer sort; + + /** + * 负责人 + */ + private String headName; + + /** + * 负责电话 + */ + private String mobile; + + /** + * 地址 + */ + private String address; + + /** + * 删除标识 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-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerOrgRelationDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerOrgRelationDTO.java new file mode 100644 index 0000000..0874693 --- /dev/null +++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerOrgRelationDTO.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.volunteer; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 志愿者组织关系表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-28 + */ +@Data +public class VolunteerOrgRelationDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 志愿者id + */ + private String volunteerId; + + /** + * 志愿组织id + */ + private Integer volunteerOrgId; + + /** + * 删除标识 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 8c5f912270a32bf7cf695349c0681fb6198e2e5e Mon Sep 17 00:00:00 2001 From: rongchao Date: Sat, 28 Aug 2021 20:11:14 +0800 Subject: [PATCH 30/34] =?UTF-8?q?=E4=B8=BA=E4=BA=BA=E5=8F=A3=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=87=87=E9=9B=86=E8=A1=A5=E5=85=85=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-custom-client/pom.xml | 6 +++ .../dto/house/SysPopulationSimpleDictDTO.java | 1 + .../esua/epdc/dto/house/SysSimpleDictDTO.java | 37 ------------------- 3 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysSimpleDictDTO.java diff --git a/epdc-cloud-custom-client/pom.xml b/epdc-cloud-custom-client/pom.xml index 49a8366..38ba34a 100644 --- a/epdc-cloud-custom-client/pom.xml +++ b/epdc-cloud-custom-client/pom.xml @@ -26,6 +26,12 @@ epdc-cloud-user-client ${epdc-cloud-client.version} + + + com.esua.epdc.yushan + epdc-cloud-admin-client + ${epdc-cloud-client.version} + diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysPopulationSimpleDictDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysPopulationSimpleDictDTO.java index 828f801..e5a3686 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysPopulationSimpleDictDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysPopulationSimpleDictDTO.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.dto.house; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; import lombok.Data; import java.io.Serializable; diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysSimpleDictDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysSimpleDictDTO.java deleted file mode 100644 index f38607b..0000000 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/SysSimpleDictDTO.java +++ /dev/null @@ -1,37 +0,0 @@ - -package com.elink.esua.epdc.dto.house; - -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * 数据字典简要信息 - * - * @author yujintao - * @date 2019/7/15 09:29 - */ -@Data -public class SysSimpleDictDTO implements Serializable { - - private static final long serialVersionUID = -4827806651372425347L; - - /** - * 字典名称 - */ - @NotBlank(message = "{sysdict.name.require}", groups = DefaultGroup.class) - private String dictName; - - /** - * 字典值 - */ - private String dictValue; - - /** - * 备注 - */ - private String remark; - -} \ No newline at end of file From 1b9f0fa7529fc1601f10d50dde8d5e5cbcf004f7 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Sat, 28 Aug 2021 21:00:14 +0800 Subject: [PATCH 31/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F-=E9=A6=96=E9=A1=B5-=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=91=98=E5=88=97=E8=A1=A8=EF=BC=8C=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F-=E6=88=91=E7=9A=84-=E5=85=9A=E5=91=98=E4=BA=AE?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=EF=BC=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F-?= =?UTF-8?q?=E6=88=91=E7=9A=84-=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=A6=E6=83=85=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EpdcAppGridOperatorFormDTO.java | 32 +++++++++++++++ .../dto/form/EpdcAppShowIdentityFormDTO.java | 41 +++++++++++++++++++ .../result/EpdcAppGridManListResultDTO.java | 36 ++++++++++++++++ .../EpdcAppIdentityDetailResultDTO.java | 35 ++++++++++++++++ pom.xml | 2 +- 5 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridOperatorFormDTO.java create mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java create mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java create mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridOperatorFormDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridOperatorFormDTO.java new file mode 100644 index 0000000..631b17f --- /dev/null +++ b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridOperatorFormDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 网格员列表请求接口对象 + * create time: 2021/8/28$ 18:11$ + */ +@Data +public class EpdcAppGridOperatorFormDTO implements Serializable { + + private static final long serialVersionUID = 682964925596811152L; + + /** + *页码 + */ + private int pageIndex; + + /** + *页容量 + */ + private int pageSize; + + /** + *所属网格id + */ + private Long deptId; + +} diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java new file mode 100644 index 0000000..8f50838 --- /dev/null +++ b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 党员亮身份信息入库请求参数 + * create time: 2021/8/28$ 19:10$ + */ +@Data +public class EpdcAppShowIdentityFormDTO implements Serializable { + + private static final long serialVersionUID = -5593165602745999938L; + + /** + *用户ID + */ + private Long userId; + + /** + *头像地址 + */ + private String headUrl; + + /** + *格言 + */ + private String motto; + + /** + *承诺 + */ + private String promise; + + /** + *服务范围 + */ + private String serviceArea; +} diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java new file mode 100644 index 0000000..49aa91c --- /dev/null +++ b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 网格员列表返回对象 + * create time: 2021/8/28$ $ + */ +@Data +public class EpdcAppGridManListResultDTO implements Serializable { + private static final long serialVersionUID = -2712265120736911585L; + + + /** + *姓名 + */ + private String realName; + + /** + *头像 + */ + private String headHrl; + + /** + *箴言 + */ + private String proverbs; + + /** + *电话 + */ + private String mobile; +} diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java new file mode 100644 index 0000000..089936c --- /dev/null +++ b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java @@ -0,0 +1,35 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 党员亮身份信息详情返回对象 + * create time: 2021/8/28$ 19:52$ + */ +@Data +public class EpdcAppIdentityDetailResultDTO implements Serializable { + private static final long serialVersionUID = 3740385980880312741L; + + /** + *格言 + */ + private String motto; + + /** + *承诺 + */ + private String promise; + + /** + *服务范围 + */ + private String serviceArea; + + /** + *头像 + */ + private String headUrl; +} diff --git a/pom.xml b/pom.xml index f83fe98..186de55 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ epdc-cloud-kpi-client epdc-cloud-message-client epdc-cloud-news-client - epdc-cloud-oss-client + epdc-cloud--client epdc-cloud-points-client epdc-cloud-user-client epdc-cloud-websocket-client From 01f48866d7d443939d51fa2e111c1abcde3b97da Mon Sep 17 00:00:00 2001 From: zhangfh Date: Sat, 28 Aug 2021 21:04:47 +0800 Subject: [PATCH 32/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F-=E9=A6=96=E9=A1=B5-=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=91=98=E5=88=97=E8=A1=A8,FormDTO=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...dcAppGridOperatorFormDTO.java => EpdcAppGridManFormDTO.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/{EpdcAppGridOperatorFormDTO.java => EpdcAppGridManFormDTO.java} (87%) diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridOperatorFormDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java similarity index 87% rename from epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridOperatorFormDTO.java rename to epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java index 631b17f..68ad9d1 100644 --- a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridOperatorFormDTO.java +++ b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java @@ -10,7 +10,7 @@ import java.io.Serializable; * create time: 2021/8/28$ 18:11$ */ @Data -public class EpdcAppGridOperatorFormDTO implements Serializable { +public class EpdcAppGridManFormDTO implements Serializable { private static final long serialVersionUID = 682964925596811152L; From 5e966ec7ae967f995a9056689d1189b28a5ee074 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Sat, 28 Aug 2021 21:08:33 +0800 Subject: [PATCH 33/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20po?= =?UTF-8?q?m=E6=96=87=E4=BB=B6epdc-cloud--client=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0oss=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 186de55..f83fe98 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ epdc-cloud-kpi-client epdc-cloud-message-client epdc-cloud-news-client - epdc-cloud--client + epdc-cloud-oss-client epdc-cloud-points-client epdc-cloud-user-client epdc-cloud-websocket-client From bde07cd552223d49f8b2ac08794f101be2858e46 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Sat, 28 Aug 2021 21:11:48 +0800 Subject: [PATCH 34/34] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E8=B5=84=E8=AE=AF=E6=8E=A5=E5=8F=A3=20DTO=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epdc/form/EpdcContentListFormDTO.java | 32 +++++++++++++ .../result/EpdcContentDetailResultDTO.java | 44 ++++++++++++++++++ .../epdc/result/EpdcContentListResultDTO.java | 45 +++++++++++++++++++ .../result/EpdcNoticeModuleListResultDTO.java | 24 ++++++++++ 4 files changed, 145 insertions(+) create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcContentListFormDTO.java create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentDetailResultDTO.java create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentListResultDTO.java create mode 100644 epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeModuleListResultDTO.java diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcContentListFormDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcContentListFormDTO.java new file mode 100644 index 0000000..a68a7c3 --- /dev/null +++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcContentListFormDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/28 20:58 + */ +@Data +public class EpdcContentListFormDTO implements Serializable { + private static final long serialVersionUID = 6154511594701893385L; + + /** + * 页码 -必传项 + */ + @NotNull(message = "页码 不能为空") + private Integer pageIndex; + + /** + * 页容量 -必传项 + */ + @NotNull(message = "页容量 不能为空") + private Integer pageSize; + + /** + * 内容类别ID，为空时即最新资讯列表 + */ + private String typeId; +} diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentDetailResultDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentDetailResultDTO.java new file mode 100644 index 0000000..5b3630a --- /dev/null +++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentDetailResultDTO.java @@ -0,0 +1,44 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/28 21:10 + */ +@Data +public class EpdcContentDetailResultDTO implements Serializable { + private static final long serialVersionUID = 1039239618034666529L; + + /** + * 内容ID + */ + private String id; + + /** + * 资讯标题 + */ + private String noticeTitle; + + /** + * 资讯发布时间 + */ + private String releaseTime; + + /** + * 发布部门 + */ + private String deptName; + + /** + * 索引图 + */ + private String imgUrl; + + /** + * 浏览数 + */ + private String readingAmount; +} diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentListResultDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentListResultDTO.java new file mode 100644 index 0000000..0e253b2 --- /dev/null +++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentListResultDTO.java @@ -0,0 +1,45 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/28 21:08 + */ +@Data +public class EpdcContentListResultDTO implements Serializable { + private static final long serialVersionUID = -6715636720585034110L; + + /** + * 内容ID + */ + private String id; + + /** + * 资讯标题 + */ + private String noticeTitle; + + /** + * 资讯发布时间 + */ + private String releaseTime; + + /** + * 发布部门 + */ + private String deptName; + + /** + * 索引图 + */ + private String imgUrl; + + /** + * 浏览数 + */ + private String readingAmount; + +} diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeModuleListResultDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeModuleListResultDTO.java new file mode 100644 index 0000000..a4a59f4 --- /dev/null +++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeModuleListResultDTO.java @@ -0,0 +1,24 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2021/8/28 20:56 + */ +@Data +public class EpdcNoticeModuleListResultDTO implements Serializable { + private static final long serialVersionUID = -7828175497993532480L; + + /** + * 栏目ID + */ + private String id; + + /** + * 栏目名称 + */ + private String typeName; +}