From 55cd1ac1b843cc6c19100d7e23b4276e4a8bc5a3 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 11 三月 2021 22:57:24 +0800
Subject: [PATCH] fix(bug修复): 排序
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 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 75cb6b0..b9ac15a 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
@@ -36,11 +36,11 @@
@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;
@@ -53,19 +53,19 @@
@TableField("deptId")
private Long deptId = 0L;
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @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 = "员工编号")
private String empNumb = "";
@NotBlank(message = "{required}")
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
@@ -80,22 +80,22 @@
@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 = "";
@NotBlank(message = "{required}")
- @FieldInfo(name = "empType", type = "varchar", explain = "员工类别,员工类别字典表")
+ @FieldInfo(name = "empType", type = "varchar", explain = "员工类别")
@TableField("empType")
@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,7 +103,7 @@
@TableField("certificateType")
private String certificateType = "";
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
@ExcelField(value = "证件号码")
private String certificateNumb = "";
@@ -117,7 +117,7 @@
@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)
@@ -249,11 +249,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,21 +273,31 @@
@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")
private String certificateList = "";
- @FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
+ //@FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
@TableField(exist = false)
@ExcelField(value = "相关证件", writeConverterExp = "1=高中毕业证,2=专科毕业证,3=本科毕业证")
private String certificateListName = "";
@@ -302,34 +312,41 @@
@ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
private String dimissionType;
+ @FieldInfo(name = "entryType", type = "varchar", explain = "入职类型")
+ @TableField("entryType")
+ private String entryType = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@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 = "int", 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
private Integer version = 0;
@@ -337,6 +354,9 @@
@FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
@TableField("remark")
private String remark = "";
+
+ @TableField("imagePath")
+ private String imagePath;
@TableField(exist = false)
private String ageStr = "";
@@ -395,4 +415,18 @@
@TableField(exist = false)
private String reporter;
-}
\ No newline at end of file
+ @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 = "部门全称")
+ @TableField("allDeptName")
+ private String allDeptName = "";
+}
--
Gitblit v1.8.0