From a704eb0aced975b55f39d71591ef87f2539e1263 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 12 三月 2021 09:21:57 +0800
Subject: [PATCH] fix(bug修复): 员工智搜导出字段调整
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java | 8 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java | 8 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java | 8 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 9 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java | 8 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java | 8 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java | 8 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java | 8 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java | 8 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 8 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 10 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 8 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java | 8 ++--
febs-server/febs-server-hr/src/main/resources/bootstrap.yml | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 8 ++--
16 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
index 6be5261..3808ad4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
@@ -48,12 +48,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -68,7 +68,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -77,7 +77,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -240,6 +239,7 @@
private String hrDoDateStr;
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
index d524c8c..f1aa9dc 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
@@ -45,12 +45,12 @@
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@@ -60,7 +60,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -69,7 +69,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -143,6 +142,7 @@
private String empStatus = "";
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
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 b9ac15a..eefeaa1 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
@@ -55,19 +55,18 @@
@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 = "民族")
@@ -426,7 +425,8 @@
@TableField(exist = false)
private String inOutType;
- @FieldInfo(name = "allDeptName", type = "varchar", explain = "部门全称")
+ @FieldInfo(name = "allDeptName", type = "varchar", explain = "护卫点(部门)")
+ @ExcelField(value = "护卫点(部门)")
@TableField("allDeptName")
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index 3e5f788..7f6d7b2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -45,12 +45,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -60,7 +60,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@@ -74,7 +74,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
////@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -172,6 +171,7 @@
private String contractStatusName = "";
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
index 807f51a..689a7b0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
@@ -47,12 +47,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -67,7 +67,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -76,7 +76,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -167,6 +166,7 @@
private String deductStr;
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
index 7c64d9c..d6c6f8d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
@@ -45,12 +45,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -65,7 +65,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -74,7 +74,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
+ @ExcelField(value = "部门(护卫点)")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -161,6 +161,7 @@
private String applayDateStr;
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
index e3cb16f..531ed2f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
@@ -45,7 +45,7 @@
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "oldDeptName", type = "varchar", explain = "原部门")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
index 10ebfcb..ae30569 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
@@ -48,12 +48,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -67,7 +67,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -76,7 +76,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -175,6 +174,7 @@
private String settleDateStr= "";
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)\"")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
index 9418feb..15318d6 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
@@ -48,12 +48,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -68,7 +68,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -77,7 +77,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -172,6 +171,7 @@
private String leaveDateStr= "";
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
index 2a1db68..2028f71 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
@@ -48,12 +48,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -68,7 +68,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -77,7 +77,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -296,6 +295,7 @@
private String settleStatusName = "";
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java
index 7372f1c..9790389 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java
@@ -44,12 +44,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -59,7 +59,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@@ -73,7 +73,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -176,6 +175,7 @@
private String ecgName = "";
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
index 2dc14bb..0032f05 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
@@ -45,12 +45,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别")
@@ -60,7 +60,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -69,7 +69,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -132,6 +131,7 @@
private String empStatus;
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
index e154282..bcdc4bd 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
@@ -45,12 +45,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@@ -60,7 +60,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -69,7 +69,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -141,6 +140,7 @@
private String empStatus;
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
index 2eea8df..e732339 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
@@ -44,12 +44,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@@ -59,7 +59,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -68,7 +68,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -147,6 +146,7 @@
private String empStatus;
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
index db9c8b6..d60731f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
@@ -44,12 +44,12 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb;
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName;
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -59,7 +59,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb;
@FieldInfo(name = "sex", type = "varchar", explain = "性别码，使用国标性别性别码")
@@ -73,7 +73,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -143,6 +142,7 @@
private Integer version;
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
index 052ea73..621e447 100644
--- a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
+++ b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@
config:
server-addr: ${nacos.url}:8848
group: DEFAULT_GROUP
- prefix: febs-server-hr
+ prefix: febs-server-Hr
file-extension: yaml
discovery:
server-addr: ${nacos.url}:8848
--
Gitblit v1.8.0