From 8dde8867d4a8690b186b5d9ce1e4f843444ed8c4 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 二月 2021 00:53:59 +0800
Subject: [PATCH] 新增附件管理
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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 f0f7f9c..0f94667 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
@@ -17,6 +17,8 @@
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+
/**
* name:EmpBaseinfo
* package:cc.mrbird.febs.server.hr.controller
@@ -50,14 +52,17 @@
@TableField(exist = false)
private String deptName = "";
+ @NotBlank(message = "{required}")
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
private String empNumb = "";
+ @NotBlank(message = "{required}")
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
private String empName = "";
+ @NotBlank(message = "{required}")
@FieldInfo(name = "sex", type = "varchar", explain = "性别")
@TableField("sex")
private String sex = "";
@@ -74,9 +79,14 @@
@TableField("jobName")
private String jobName = "";
- @FieldInfo(name = "empType", type = "varchar", explain = "员工类别,员工类另字典表")
+ @NotBlank(message = "{required}")
+ @FieldInfo(name = "empType", type = "varchar", explain = "员工类别,员工类别字典表")
@TableField("empType")
private String empType = "";
+
+ @FieldInfo(name = "empTypeName", type = "varchar", explain = "员工类别,员工类别字典表")
+ @TableField(exist = false)
+ private String empTypeName = "";
@FieldInfo(name = "certificateType", type = "varchar", explain = "证件类型,人员证件类型，国标代码")
@TableField("certificateType")
@@ -187,6 +197,10 @@
@TableField("archivesStatus")
private String archivesStatus = "";
+ @FieldInfo(name = "archivesStatusName", type = "varchar", explain = "档案情况")
+ @TableField(exist = false)
+ private String archivesStatusName = "";
+
@FieldInfo(name = "bankName", type = "varchar", explain = "银行名称")
@TableField("bankName")
private String bankName = "";
@@ -198,6 +212,10 @@
@FieldInfo(name = "InsuranceType", type = "varchar", explain = "保险类型")
@TableField("InsuranceType")
private String insuranceType = "";
+
+ @FieldInfo(name = "InsuranceTypeName", type = "varchar", explain = "保险类型")
+ @TableField(exist = false)
+ private String insuranceTypeName = "";
@FieldInfo(name = "socialNumb", type = "varchar", explain = "社保电脑号")
@TableField("socialNumb")
@@ -226,7 +244,17 @@
@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 = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -250,7 +278,7 @@
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @FieldInfo(name = "delFlag", type = "int", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
@@ -258,5 +286,14 @@
@TableField("version")
@Version
private Integer version = 0;
+
+ @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