From 80bde86f943a8622d39b4d9d0ab056c8829106cd Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期三, 17 三月 2021 01:56:40 +0800
Subject: [PATCH] 智搜导出字段排序修改
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 27a2dd3..5dfddf3 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 = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@NotBlank(message = "{required}")
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@NotBlank(message = "{required}")
@@ -105,7 +104,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
@FieldInfo(name = "nation", type = "varchar", explain = "民族")
@@ -422,4 +421,16 @@
@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