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; 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 new file mode 100644 index 0000000..f6af500 --- /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,19 @@ +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 11:01 + */ +@Data +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 new file mode 100644 index 0000000..064aeaf --- /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,19 @@ +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 14:38 + */ +@Data +public class EpdcWorkbenchUserAnalysisFormDTO implements Serializable { + private static final long serialVersionUID = -3866580648194645619L; + + 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/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; +} 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; +} 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; +}