From 3ae6bd194fe1f17b4f5d96cb78b057705e5d0d78 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 31 五月 2021 14:11:57 +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 | 219 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 197 insertions(+), 22 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..1df8c06 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
@@ -4,18 +4,23 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
/**
* name:EmpBaseinfo
@@ -28,62 +33,78 @@
*/
@Data
@TableName("t_emp_baseInfo")
+@Excel("员工基本信息表")
public class EmpBaseInfo implements Serializable {
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableId(value = "empId")
private Long empId = 0L;
- @FieldInfo(name = "customerId", type = "bigint", explain = "租户Id")
+ //@FieldInfo(name = "customerId", type = "bigint", explain = "租户Id")
@TableField("customerId")
private Long customerId = 0L;
@FieldInfo(name = "archivesNumb", type = "varchar", explain = "档案号")
@TableField("archivesNumb")
+ @ExcelField(value = "档案号")
private String archivesNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
- @TableField(exist = false)
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
+ @TableField("deptName")
private String deptName = "";
- @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @NotBlank(message = "{required}")
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
+ @ExcelField(value = "编号")
private String empNumb = "";
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @NotBlank(message = "{required}")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
+ @ExcelField(value = "姓名")
private String empName = "";
+ @NotBlank(message = "{required}")
@FieldInfo(name = "sex", type = "varchar", explain = "性别")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "sexName", type = "varchar", explain = "性别")
@TableField(exist = false)
private String sexName = "";
- @FieldInfo(name = "jobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("jobId")
private Long jobId = 0L;
- @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @FieldInfo(name = "jobName", type = "varchar", explain = "所属岗位")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
- @FieldInfo(name = "empType", type = "varchar", explain = "员工类别,员工类另字典表")
+ @NotBlank(message = "{required}")
+ @FieldInfo(name = "empType", type = "varchar", explain = "员工类别")
@TableField("empType")
+ @ExcelField(value = "员工类别", writeConverterExp = "1=正式工,2=临时工")
private String empType = "";
+
+ @FieldInfo(name = "empTypeName", type = "varchar", explain = "员工类别")
+ @TableField(exist = false)
+ private String empTypeName = "";
@FieldInfo(name = "certificateType", type = "varchar", explain = "证件类型,人员证件类型，国标代码")
@TableField("certificateType")
private String certificateType = "";
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
@FieldInfo(name = "nation", type = "varchar", explain = "民族")
@@ -92,13 +113,15 @@
@FieldInfo(name = "nationName", type = "varchar", explain = "民族")
@TableField(exist = false)
+ @ExcelField(value = "民族")
private String nationName = "";
- @FieldInfo(name = "certificateValidity", type = "date", explain = "证件有效期")
+ @FieldInfo(name = "certificateValidity", type = "date", explain = "身份证有效期")
@TableField("certificateValidity")
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "证件有效期", writeConverter = TimeConverter.class)
private Date certificateValidity;
@FieldInfo(name = "marriage", type = "varchar", explain = "婚姻状况")
@@ -107,14 +130,17 @@
@FieldInfo(name = "marriageName", type = "varchar", explain = "婚姻状况")
@TableField(exist = false)
+ @ExcelField(value = "婚姻状况")
private String marriageName = "";
@FieldInfo(name = "age", type = "tinyint", explain = "年龄")
@TableField("age")
+ @ExcelField(value = "年龄")
private Integer age = 0;
@FieldInfo(name = "stature", type = "smallint", explain = "身高")
@TableField("stature")
+ @ExcelField(value = "身高")
private Integer stature = 0;
@FieldInfo(name = "birthdate", type = "date", explain = "出生日期")
@@ -122,6 +148,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "出生日期", writeConverter = TimeConverter.class)
private Date birthdate;
@FieldInfo(name = "politics", type = "varchar", explain = "政治面貌")
@@ -130,6 +157,7 @@
@FieldInfo(name = "politicsName", type = "varchar", explain = "政治面貌")
@TableField(exist = false)
+ @ExcelField(value = "政治面貌")
private String politicsName = "";
@FieldInfo(name = "entryDate", type = "date", explain = "入职日期")
@@ -137,7 +165,16 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "入职日期", writeConverter = TimeConverter.class)
private Date entryDate;
+
+ @FieldInfo(name = "dimissionDate", type = "date", explain = "离职日期")
+ @TableField("dimissionDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "离职日期", writeConverter = TimeConverter.class)
+ private Date dimissionDate;
@FieldInfo(name = "education", type = "varchar", explain = "最高学历")
@TableField("education")
@@ -145,11 +182,13 @@
@FieldInfo(name = "educationName", type = "varchar", explain = "最高学历")
@TableField(exist = false)
+ @ExcelField(value = "最高学历")
private String educationName = "";
@FieldInfo(name = "seniority", type = "tinyint", explain = "入司工龄")
@TableField("seniority")
- private Integer seniority = 0;
+ @ExcelField(value = "入司工龄")
+ private String seniority = "0年0月";
@FieldInfo(name = "nativePlace", type = "varchar", explain = "籍贯")
@TableField("nativePlace")
@@ -157,67 +196,101 @@
@FieldInfo(name = "nativePlaceName", type = "varchar", explain = "籍贯")
@TableField(exist = false)
+ @ExcelField(value = "籍贯")
private String nativePlaceName = "";
@FieldInfo(name = "censusAddress", type = "varchar", explain = "户籍地址")
@TableField("censusAddress")
+ @ExcelField(value = "户籍地址")
private String censusAddress = "";
@FieldInfo(name = "currentAddress", type = "varchar", explain = "现住址")
@TableField("currentAddress")
+ @ExcelField(value = "现住址")
private String currentAddress = "";
@FieldInfo(name = "guardNumb", type = "varchar", explain = "保安员证号")
@TableField("guardNumb")
+ @ExcelField(value = "保安员证号")
private String guardNumb = "";
@FieldInfo(name = "telePhone", type = "varchar", explain = "电话号码")
@TableField("telePhone")
+ @ExcelField(value = "电话号码")
private String telePhone = "";
@FieldInfo(name = "returnReceipt", type = "varchar", explain = "保安员回执")
@TableField("returnReceipt")
+ @ExcelField(value = "保安员回执")
private String returnReceipt = "";
@FieldInfo(name = "introducer", type = "varchar", explain = "招聘介绍人")
@TableField("introducer")
+ @ExcelField(value = "招聘介绍人")
private String introducer = "";
@FieldInfo(name = "archivesStatus", type = "varchar", explain = "档案情况")
@TableField("archivesStatus")
private String archivesStatus = "";
+ @FieldInfo(name = "archivesStatusName", type = "varchar", explain = "档案情况")
+ @TableField(exist = false)
+ @ExcelField(value = "档案情况")
+ private String archivesStatusName = "";
+
@FieldInfo(name = "bankName", type = "varchar", explain = "银行名称")
@TableField("bankName")
+ @ExcelField(value = "银行名称")
private String bankName = "";
@FieldInfo(name = "bankNumb", type = "varchar", explain = "银行账号")
@TableField("bankNumb")
+ @ExcelField(value = "银行账号")
private String bankNumb = "";
- @FieldInfo(name = "InsuranceType", type = "varchar", explain = "保险类型")
+ @FieldInfo(name = "insuranceType", type = "varchar", explain = "保险类型")
@TableField("InsuranceType")
private String insuranceType = "";
+ @FieldInfo(name = "insuranceTypeName", type = "varchar", explain = "保险类型")
+ @TableField(exist = false)
+ @ExcelField(value = "保险类型")
+ private String insuranceTypeName = "";
+
@FieldInfo(name = "socialNumb", type = "varchar", explain = "社保电脑号")
@TableField("socialNumb")
+ @ExcelField(value = "社保电脑号")
private String socialNumb = "";
@FieldInfo(name = "family", type = "varchar", explain = "家庭成员及关系")
@TableField("family")
+ @ExcelField(value = "家庭成员及关系")
private String family = "";
@FieldInfo(name = "handbookStatus", type = "varchar", explain = "员工手册")
@TableField("handbookStatus")
+ @ExcelField(value = "员工手册", writeConverterExp = "0=未发,1=已发")
private String handbookStatus = "";
+
+ @FieldInfo(name = "handbookStatusName", type = "varchar", explain = "员工手册")
+ @TableField(exist = false)
+ @ExcelField(value = "员工手册")
+ private String handbookStatusName = "";
@FieldInfo(name = "urgencyPhone", type = "varchar", explain = "紧急联系电话")
@TableField("urgencyPhone")
+ @ExcelField(value = "紧急联系电话")
private String urgencyPhone = "";
- @FieldInfo(name = "empCardStatus", type = "varchar", explain = "工作证")
+ @FieldInfo(name = "empCardStatus", type = "varchar", explain = "工作证代码")
@TableField("empCardStatus")
+ @ExcelField(value = "工作证", writeConverterExp = "0=未发,1=已发")
private String empCardStatus = "";
+
+ @FieldInfo(name = "empCardStatusName", type = "varchar", explain = "工作证")
+ @TableField(exist = false)
+ @ExcelField(value = "工作证")
+ private String empCardStatusName = "";
@FieldInfo(name = "certificateList", type = "varchar", explain = "相关证件")
@TableField("certificateList")
@@ -225,38 +298,140 @@
@FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
@TableField(exist = false)
+ @ExcelField(value = "相关证件", writeConverterExp = "1=高中毕业证,2=专科毕业证,3=本科毕业证")
private String certificateListName = "";
+ @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+ @TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
+ private String empStatus = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
+ @TableField("dimissionType")
+ @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
+ private String dimissionType;
+
+ @FieldInfo(name = "entryType", type = "varchar", explain = "入职类型")
+ @TableField("entryType")
+ private String entryType = "";
+
+ @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
+ @TableField(exist = false)
+ private String entryTypeName = "新入职";
+
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@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;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
-}
\ No newline at end of file
+ @FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
+ @TableField("remark")
+ private String remark = "";
+
+ @TableField("imagePath")
+ private String imagePath;
+
+ @TableField(exist = false)
+ private String ageStr = "";
+
+ @TableField(exist = false)
+ private String entryDateStr= "";
+
+ @TableField(exist = false)
+ private String dimissionDateStr= "";
+
+ @FieldInfo(name = "dimissionTypeName", type = "varchar", explain = "离职类型")
+ @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;
+
+ @FieldInfo(name = "baseKey", type = "varchar", explain = "查询关键词")
+ @TableField(exist = false)
+ private String baseKey;
+
+ @FieldInfo(name = "empStatusName", type = "varchar", explain = "员工状态")
+ @TableField(exist = false)
+ private String empStatusName = "";
+
+ @TableField(exist = false)
+ private String inOutType;
+
+ @FieldInfo(name = "allDeptName", type = "varchar", explain = "护卫点(部门)")
+ @ExcelField(value = "护卫点(部门)")
+ @TableField("allDeptName")
+ private String allDeptName = "";
+
+ // @FieldInfo(name = "dimissRemark", type = "varchar", explain = "离职备注")
+ // @TableField("dimissRemark")
+ // private String dimissRemark = "";
+}
--
Gitblit v1.8.0