From 63c7e9d7051ed6742eb7334346a53376b0247c29 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 01 四月 2021 09:46:03 +0800
Subject: [PATCH] 删除
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 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 6b56ee1..44be67a 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,25 +49,24 @@
@ExcelField(value = "档案号")
private String archivesNumb = "";
- //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "护卫点(部门)")
private String deptName = "";
@NotBlank(message = "{required}")
- @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@NotBlank(message = "{required}")
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@NotBlank(message = "{required}")
@@ -76,7 +75,7 @@
@ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
- //@FieldInfo(name = "sexName", type = "varchar", explain = "性别")
+ @FieldInfo(name = "sexName", type = "varchar", explain = "性别")
@TableField(exist = false)
private String sexName = "";
@@ -84,7 +83,7 @@
@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 = "";
@@ -95,7 +94,7 @@
@ExcelField(value = "员工类别", writeConverterExp = "1=正式工,2=临时工")
private String empType = "";
- //@FieldInfo(name = "empTypeName", type = "varchar", explain = "员工类别")
+ @FieldInfo(name = "empTypeName", type = "varchar", explain = "员工类别")
@TableField(exist = false)
private String empTypeName = "";
@@ -103,21 +102,21 @@
@TableField("certificateType")
private String certificateType = "";
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
@FieldInfo(name = "nation", type = "varchar", explain = "民族")
@TableField("nation")
private String nation = "";
- //@FieldInfo(name = "nationName", type = "varchar", explain = "民族")
+ @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)
@@ -129,7 +128,7 @@
@TableField("marriage")
private String marriage = "";
- //@FieldInfo(name = "marriageName", type = "varchar", explain = "婚姻状况")
+ @FieldInfo(name = "marriageName", type = "varchar", explain = "婚姻状况")
@TableField(exist = false)
@ExcelField(value = "婚姻状况")
private String marriageName = "";
@@ -156,7 +155,7 @@
@TableField("politics")
private String politics = "";
- //@FieldInfo(name = "politicsName", type = "varchar", explain = "政治面貌")
+ @FieldInfo(name = "politicsName", type = "varchar", explain = "政治面貌")
@TableField(exist = false)
@ExcelField(value = "政治面貌")
private String politicsName = "";
@@ -181,7 +180,7 @@
@TableField("education")
private String education = "";
- //@FieldInfo(name = "educationName", type = "varchar", explain = "最高学历")
+ @FieldInfo(name = "educationName", type = "varchar", explain = "最高学历")
@TableField(exist = false)
@ExcelField(value = "最高学历")
private String educationName = "";
@@ -195,7 +194,7 @@
@TableField("nativePlace")
private String nativePlace = "";
- //@FieldInfo(name = "nativePlaceName", type = "varchar", explain = "籍贯")
+ @FieldInfo(name = "nativePlaceName", type = "varchar", explain = "籍贯")
@TableField(exist = false)
@ExcelField(value = "籍贯")
private String nativePlaceName = "";
@@ -234,7 +233,7 @@
@TableField("archivesStatus")
private String archivesStatus = "";
- //@FieldInfo(name = "archivesStatusName", type = "varchar", explain = "档案情况")
+ @FieldInfo(name = "archivesStatusName", type = "varchar", explain = "档案情况")
@TableField(exist = false)
@ExcelField(value = "档案情况")
private String archivesStatusName = "";
@@ -249,11 +248,11 @@
@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 = "保险类型")
+ @FieldInfo(name = "insuranceTypeName", type = "varchar", explain = "保险类型")
@TableField(exist = false)
@ExcelField(value = "保险类型")
private String insuranceTypeName = "";
@@ -273,7 +272,7 @@
@ExcelField(value = "员工手册", writeConverterExp = "0=未发,1=已发")
private String handbookStatus = "";
- //@FieldInfo(name = "handbookStatusName", type = "varchar", explain = "员工手册")
+ @FieldInfo(name = "handbookStatusName", type = "varchar", explain = "员工手册")
@TableField(exist = false)
@ExcelField(value = "员工手册")
private String handbookStatusName = "";
@@ -283,12 +282,12 @@
@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 = "工作证")
+ @FieldInfo(name = "empCardStatusName", type = "varchar", explain = "工作证")
@TableField(exist = false)
@ExcelField(value = "工作证")
private String empCardStatusName = "";
@@ -316,7 +315,7 @@
@TableField("entryType")
private String entryType = "";
- //@FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
+ @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
@TableField(exist = false)
private String entryTypeName = "新入职";
@@ -367,6 +366,7 @@
@TableField(exist = false)
private String dimissionDateStr= "";
+ @FieldInfo(name = "dimissionTypeName", type = "varchar", explain = "离职类型")
@TableField(exist = false)
private String dimissionTypeName= "";
@@ -418,4 +418,20 @@
@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