From 8bb9cf4117634383f45bc8e2be5c92993e5ef0b6 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期六, 20 二月 2021 12:01:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 131 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 128 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 1bca92c..11f46aa 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,17 +52,24 @@
@TableField("deptName")
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 = "";
- @FieldInfo(name = "sex", type = "varchar", explain = "性别码，使用国标性别性别码")
+ @NotBlank(message = "{required}")
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别")
@TableField("sex")
private String sex = "";
+
+ @FieldInfo(name = "sexName", type = "varchar", explain = "性别")
+ @TableField(exist = false)
+ private String sexName = "";
@FieldInfo(name = "jobId", type = "bigint", explain = "岗位Id")
@TableField("jobId")
@@ -70,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")
@@ -86,6 +100,10 @@
@TableField("nation")
private String nation = "";
+ @FieldInfo(name = "nationName", type = "varchar", explain = "民族")
+ @TableField(exist = false)
+ private String nationName = "";
+
@FieldInfo(name = "certificateValidity", type = "date", explain = "证件有效期")
@TableField("certificateValidity")
@JsonSerialize(using = DateSerializer.class)
@@ -96,6 +114,10 @@
@FieldInfo(name = "marriage", type = "varchar", explain = "婚姻状况")
@TableField("marriage")
private String marriage = "";
+
+ @FieldInfo(name = "marriageName", type = "varchar", explain = "婚姻状况")
+ @TableField(exist = false)
+ private String marriageName = "";
@FieldInfo(name = "age", type = "tinyint", explain = "年龄")
@TableField("age")
@@ -116,6 +138,10 @@
@TableField("politics")
private String politics = "";
+ @FieldInfo(name = "politicsName", type = "varchar", explain = "政治面貌")
+ @TableField(exist = false)
+ private String politicsName = "";
+
@FieldInfo(name = "entryDate", type = "date", explain = "入职日期")
@TableField("entryDate")
@JsonSerialize(using = DateSerializer.class)
@@ -123,9 +149,20 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
+ @FieldInfo(name = "dimissionDate", type = "date", explain = "离职日期")
+ @TableField("dimissionDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date dimissionDate;
+
@FieldInfo(name = "education", type = "varchar", explain = "最高学历")
@TableField("education")
private String education = "";
+
+ @FieldInfo(name = "educationName", type = "varchar", explain = "最高学历")
+ @TableField(exist = false)
+ private String educationName = "";
@FieldInfo(name = "seniority", type = "tinyint", explain = "入司工龄")
@TableField("seniority")
@@ -134,6 +171,10 @@
@FieldInfo(name = "nativePlace", type = "varchar", explain = "籍贯")
@TableField("nativePlace")
private String nativePlace = "";
+
+ @FieldInfo(name = "nativePlaceName", type = "varchar", explain = "籍贯")
+ @TableField(exist = false)
+ private String nativePlaceName = "";
@FieldInfo(name = "censusAddress", type = "varchar", explain = "户籍地址")
@TableField("censusAddress")
@@ -163,6 +204,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 = "";
@@ -174,6 +219,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")
@@ -199,6 +248,21 @@
@TableField("certificateList")
private String certificateList = "";
+ @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 = "dimissionType", type = "varchar", explain = "离职类型")
+ @TableField("dimissionType")
+ private String dimissionType;
+
+
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@@ -221,7 +285,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;
@@ -230,4 +294,65 @@
@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= "";
+
+ @TableField(exist = false)
+ private String dimissionTypeName= "";
+
+ @FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
+ @TableField(exist = false)
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date beginDate;
+
+ @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
+ @TableField(exist = false)
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+
+ @FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
+ @TableField(exist = false)
+ private String contractStatus = "";
+
+ @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @TableField(exist = false)
+ private Integer contractPeriod = 0;
+
+ @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
+ @TableField(exist = false)
+ private String transactor = "";
+
+ @FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
+ @TableField(exist = false)
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date signingDate;
+
+ @FieldInfo(name = "applayDate", type = "date", explain = "辞职申请日期")
+ @TableField(exist = false)
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date applayDate;
+
+ @TableField(exist = false)
+ private String reason;
+ @TableField(exist = false)
+ private String reporter;
+
}
\ No newline at end of file
--
Gitblit v1.8.0