From 3cc8d1cc3662d88fe7f3666fb1f99e1b19411424 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期一, 14 七月 2025 16:59:58 +0800
Subject: [PATCH] 新功能加问题修复
---
multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysDept.java | 148 +++++++++++++++++++++++++++++++++---------------
1 files changed, 101 insertions(+), 47 deletions(-)
diff --git a/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysDept.java b/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysDept.java
index 6b6f4da..f835a1f 100644
--- a/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysDept.java
+++ b/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysDept.java
@@ -7,9 +7,7 @@
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.util.ArrayList;
import java.util.List;
@@ -19,7 +17,7 @@
*
* @author expert
*/
-@ApiModel(value = "SysDept对象", description = "部门业务处室")
+@ApiModel(value = "SysDept对象", description = "部门")
public class SysDept extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -29,7 +27,7 @@
private Long deptId;
/** 父部门ID */
- @ApiModelProperty("父部门ID")
+ @ApiModelProperty("主要负责部门ID作废")
private Long parentId;
/** 祖级列表 */
@@ -47,13 +45,11 @@
/** 负责人 */
@ApiModelProperty("负责人")
- private String leader;
+ private Long leaderUserId;
- /** 联系电话 */
- private String phone;
+ @ApiModelProperty("公司id")
+ private Long companyId;
- /** 邮箱 */
- private String email;
/** 部门状态:0正常,1停用 */
@ApiModelProperty("部门状态:0正常,1停用")
@@ -63,9 +59,31 @@
private String delFlag;
/** 父部门名称 */
- @ApiModelProperty("父部门名称")
+ @ApiModelProperty("主要负责部门名称")
private String parentName;
-
+
+ @ApiModelProperty("部门负责人名称")
+ private String leaderName;
+
+ @ApiModelProperty("部门人数")
+ private Integer personNum;
+
+ @ApiModelProperty("内审人员id")
+ private Long internalAuditors;
+
+ @ApiModelProperty("内审人员名称")
+ private String internalAuditorsName;
+
+ @ApiModelProperty("部门职责")
+ private String responsibilities;
+
+
+ @ApiModelProperty("部门类型1默认2管理")
+ @NotBlank(message = "部门类型不能为空")
+ private String deptType;
+
+ @ApiModelProperty("是否职能分配1是2否")
+ private String responsType;
/** 子部门 */
private List<SysDept> children = new ArrayList<SysDept>();
@@ -111,7 +129,6 @@
this.deptName = deptName;
}
- @NotNull(message = "显示顺序不能为空")
public Integer getOrderNum()
{
return orderNum;
@@ -122,38 +139,6 @@
this.orderNum = orderNum;
}
- public String getLeader()
- {
- return leader;
- }
-
- public void setLeader(String leader)
- {
- this.leader = leader;
- }
-
- @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
- public String getPhone()
- {
- return phone;
- }
-
- public void setPhone(String phone)
- {
- this.phone = phone;
- }
-
- @Email(message = "邮箱格式不正确")
- @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
- public String getEmail()
- {
- return email;
- }
-
- public void setEmail(String email)
- {
- this.email = email;
- }
public String getStatus()
{
@@ -203,9 +188,6 @@
.append("ancestors", getAncestors())
.append("deptName", getDeptName())
.append("orderNum", getOrderNum())
- .append("leader", getLeader())
- .append("phone", getPhone())
- .append("email", getEmail())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
@@ -214,4 +196,76 @@
.append("updateTime", getUpdateTime())
.toString();
}
+
+ public Long getLeaderUserId() {
+ return leaderUserId;
+ }
+
+ public void setLeaderUserId(Long leaderUserId) {
+ this.leaderUserId = leaderUserId;
+ }
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getPersonNum() {
+ return personNum;
+ }
+
+ public void setPersonNum(Integer personNum) {
+ this.personNum = personNum;
+ }
+
+ public Long getInternalAuditors() {
+ return internalAuditors;
+ }
+
+ public void setInternalAuditors(Long internalAuditors) {
+ this.internalAuditors = internalAuditors;
+ }
+
+ public String getResponsibilities() {
+ return responsibilities;
+ }
+
+ public void setResponsibilities(String responsibilities) {
+ this.responsibilities = responsibilities;
+ }
+
+ public String getLeaderName() {
+ return leaderName;
+ }
+
+ public void setLeaderName(String leaderName) {
+ this.leaderName = leaderName;
+ }
+
+ public String getInternalAuditorsName() {
+ return internalAuditorsName;
+ }
+
+ public void setInternalAuditorsName(String internalAuditorsName) {
+ this.internalAuditorsName = internalAuditorsName;
+ }
+
+ public String getDeptType() {
+ return deptType;
+ }
+
+ public void setDeptType(String deptType) {
+ this.deptType = deptType;
+ }
+
+ public String getResponsType() {
+ return responsType;
+ }
+
+ public void setResponsType(String responsType) {
+ this.responsType = responsType;
+ }
}
--
Gitblit v1.9.2