From 13253bab9959d710dea794dc33e615ace2da172c Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 26 Aug 2021 11:02:01 +0800 Subject: [PATCH 1/5] =?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 2/5] =?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 3/5] =?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 4/5] =?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 5/5] =?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;