From 8a2b8ef34fd521457c5ede0c561bb1214985bc3b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 二月 2021 14:30:54 +0800
Subject: [PATCH] feat(在职员工): 关闭员工档案接口
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index ec57073..d2849bb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -49,7 +49,7 @@
private Long deptId = 0L;
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
- @TableField(exist = false)
+ @TableField("deptName")
private String deptName = "";
@NotBlank(message = "{required}")
@@ -244,6 +244,22 @@
@FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
@TableField(exist = false)
private String certificateListName = "";
+
+ @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+ @TableField("empStatus")
+ private String empStatus = "";
+
+ @FieldInfo(name = "dimissionDate", type = "datetime", explain = "离职日期")
+ @TableField("dimissionDate")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date dimissionDate;
+
+ @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
+ @TableField("dimissionType")
+ private String dimissionType;
+
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -276,4 +292,17 @@
@Version
private Integer version = 0;
+ @FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
+ @TableField("remark")
+ private String remark = "";
+
+ @TableField(exist = false)
+ private String ageStr = "";
+
+ @TableField(exist = false)
+ private String entryDateStr= "";
+
+ @TableField(exist = false)
+ private String dimissionDateStr= "";
+
}
\ No newline at end of file
--
Gitblit v1.8.0