From b2dee2f787cb8e27417373d0a31ad39501017782 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 27 二月 2022 09:21:29 +0800
Subject: [PATCH] fix(bug修复): 信息录入模块录入基本信息时的入职类型默认设置成新入职
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
index 3f797d6..70071d3 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
@@ -58,15 +58,25 @@
*/
@TableId(value = "USER_ID", type = IdType.AUTO)
private Long userId;
-
+ /**
+ * 部门名称
+ */
+ @TableField(exist = false)
+ @ExcelField(value = "部门(护卫点)")
+ private String deptName;
/**
* 用户名
*/
@TableField("USERNAME")
@Size(min = 4, max = 10, message = "{range}")
- @ExcelField(value = "用户名")
+ @ExcelField(value = "用户名",comment = "提示：必填，只能填写用户名")
private String username;
-
+ /**
+ * 头像
+ */
+ @TableField("nickName")
+ @ExcelField(value = "员工姓名",comment = "提示：必填，只能填写员工姓名")
+ private String nickName;
/**
* 密码
*/
@@ -97,6 +107,13 @@
private String mobile;
/**
+ * 身份證號
+ */
+ @TableField("certificateNumb")
+ @ExcelField(value = "身份证号",comment = "提示：必填，只能填写身份证")
+ private String certificateNumb;
+
+ /**
* 状态 0锁定 1有效
*/
@TableField("STATUS")
@@ -108,29 +125,24 @@
* 创建时间
*/
@TableField("CREATE_TIME")
- @ExcelField(value = "创建时间", writeConverter = TimeConverter.class)
private Date createTime;
/**
* 修改时间
*/
@TableField("MODIFY_TIME")
- @ExcelField(value = "修改时间", writeConverter = TimeConverter.class)
private Date modifyTime;
/**
* 最近访问时间
*/
@TableField("LAST_LOGIN_TIME")
- @ExcelField(value = "最近访问时间", writeConverter = TimeConverter.class)
private Date lastLoginTime;
/**
* 性别 0男 1女 2 保密
*/
@TableField("SSEX")
- @NotBlank(message = "{required}")
- @ExcelField(value = "性别", writeConverterExp = "0=男,1=女,2=保密")
private String sex;
/**
@@ -139,19 +151,16 @@
@TableField("AVATAR")
private String avatar;
+
+
/**
* 描述
*/
@TableField("DESCRIPTION")
@Size(max = 100, message = "{noMoreThan}")
- @ExcelField(value = "个人描述")
private String description;
- /**
- * 部门名称
- */
- @TableField(exist = false)
- private String deptName;
+
@TableField(exist = false)
private String createTimeFrom;
@@ -170,4 +179,6 @@
@TableField(exist = false)
private String deptIds;
+ @TableField(exist = false)
+ private String allDeptName;
}
--
Gitblit v1.8.0