From 640cecb85d077a2b79d93eed1c928c4e916730fe Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 26 Aug 2021 17:14:01 +0800 Subject: [PATCH 1/4] =?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 2/4] =?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 3/4] =?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 4/4] =?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; +}