From 9e47ca901301d0a7af9bdfe49e9845ee07f5f456 Mon Sep 17 00:00:00 2001 From: heheng <475597332@qq.com> Date: 星期四, 12 六月 2025 14:46:09 +0800 Subject: [PATCH] 部分功能调整 --- multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysDept.java | 123 +++++++++++++++++++++++++--------------- 1 files changed, 77 insertions(+), 46 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..6becccf 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,8 +59,23 @@ 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; /** 子部门 */ private List<SysDept> children = new ArrayList<SysDept>(); @@ -111,7 +122,6 @@ this.deptName = deptName; } - @NotNull(message = "显示顺序不能为空") public Integer getOrderNum() { return orderNum; @@ -122,38 +132,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 +181,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 +189,60 @@ .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; + } } -- Gitblit v1.9.2