Merge remote-tracking branch 'origin/master'

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;

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<Long> deptIdList;
+}

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;
+}

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/DifficultItemOverseeDTO.java

@@ -0,0 +1,117 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/RoleDifficultDeptDTO.java

@@ -0,0 +1,82 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}