From 104ae610d1d7e8dab5fff9abe4a56208941d62d7 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 14 十月 2025 09:50:55 +0800
Subject: [PATCH] 修改修复问题及新增功能
---
multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java b/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java
index 5c9a065..b8c16f3 100644
--- a/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java
+++ b/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java
@@ -13,8 +13,10 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Set;
import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
@@ -51,20 +53,35 @@
private String name;
@NotNull(message = "用户类型不能为空")
- @ApiModelProperty(value = "用户类型(0系统用户，1企业级用户，2部门级用户，3车间级(岗位)级，4其他，默认0)",required = true)
+ @ApiModelProperty(value = "用户类型(0系统用户，1企业级用户，2部门级用户，3车间级(岗位)级，4其他，默认0,6企业管理员)",required = true)
@TableField("user_type")
private Integer userType;
- @NotBlank(message = "手机号码不能为空")
- @Length(min = 11, max = 11, message = "手机号只能为11位")
- @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误！")
- @ApiModelProperty(value = "手机号码",required = true)
+// @NotBlank(message = "手机号码不能为空")
+// @Length(min = 11, max = 11, message = "手机号只能为11位")
+// @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误！")
+ @ApiModelProperty(value = "手机号码",required = false)
@TableField("phone")
private String phone;
@ApiModelProperty("用户性别(0男，1女，2未知，默认2)")
@TableField("sex")
private Integer sex;
+
+ @ApiModelProperty(value = "用户年龄",required = true)
+ @NotNull(message = "年龄不能为空")
+ @TableField("age")
+ private Integer age;
+
+ @ApiModelProperty(value = "人员类别1技术2管理3行政4特殊作业",required = true)
+ @NotNull(message = "人员类别1技术2管理3行政")
+ @TableField("person_type")
+ private Integer personType;
+
+ @NotBlank(message = "职称不能为空")
+ @ApiModelProperty("职称1、初级2中级3高级")
+ @TableField("positional")
+ private String positional;
@ApiModelProperty("父级账号id")
@TableField("parent_id")
@@ -105,6 +122,44 @@
@TableField("version")
private Integer version;
+ @ApiModelProperty("部门")
+ @TableField("dept_id")
+ private Long deptId;
+
+ @ApiModelProperty("部门名称")
+ @TableField(exist = false)
+ private String deptName;
+
+ @ApiModelProperty("职务")
+ @TableField("duty")
+ private String duty;
+
+ @ApiModelProperty(value = "专业",required = true)
+ @TableField("post")
+ @NotBlank(message = "专业不能为空")
+ private String post;
+
+ @ApiModelProperty("身份证号")
+ @TableField("id_card")
+ private String idCard;
+
+ @ApiModelProperty("入职时间")
+ @TableField("entry_time")
+ private LocalDate entryTime;
+
+ @ApiModelProperty("离职时间")
+ @TableField("resign_time")
+ private LocalDate resignTime;
+
+ @ApiModelProperty(value = "学历1、高中及以下2、专科3、本科4、硕士5、博士及以上",required = true)
+ @NotNull(message = "学历不能为空")
+ @TableField("qualification")
+ private Integer qualification;
+
+ @ApiModelProperty("特殊作业证书")
+ @TableField("operation_certificate")
+ private String operationCertificate;
+
@ApiModelProperty("公司名称")
@TableField(exist = false)
private String companyName;
@@ -120,16 +175,8 @@
@TableField(exist = false)
private List<SysRole> roles;
- @ApiModelProperty("是否为管理员")
- @TableField(exist = false)
- private Boolean admin;
- public boolean isAdmin()
- {
- return isAdmin(this.id);
- }
+// @TableField(exist = false)
+// @ApiModelProperty("角色ids")
+// private Set<Long> roleIds;
- public static boolean isAdmin(Long userId)
- {
- return userId != null && 1L == userId;
- }
}
--
Gitblit v1.9.2