From b622ca077cd6a4e35c1476d497999538b3720e1a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 25 三月 2021 00:12:54 +0800
Subject: [PATCH] feat(员工其它信息): 员工档案中的其它信息按时间顺序排序
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java | 120 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 68 insertions(+), 52 deletions(-)
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 89e59ca..3401d6a 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
@@ -42,54 +42,41 @@
@TableField("empId")
private Long empId = 0L;
- @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
-
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ @ExcelField(value = "岗位")
+ private String jobName = "";
+
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
-
- @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
- @TableField("empStatus")
- @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
- private String empStatus = "";
-
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
-
+
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
@ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
-
- //@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 = "";
-
- //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
- @TableField("JobId")
- private Long jobId = 0L;
-
- @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
- @TableField("jobName")
- @ExcelField(value = "岗位名称")
- private String jobName = "";
-
+
@FieldInfo(name = "hospital", type = "varchar", explain = "体检医院")
@TableField("hospital")
@ExcelField(value = "体检医院")
private String hospital = "";
-
+
@FieldInfo(name = "physicalExamDate", type = "date", explain = "体检日期")
@TableField("physicalExamDate")
@JsonSerialize(using = DateSerializer.class)
@@ -97,27 +84,27 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelField(value = "体检日期", writeConverter = TimeConverter.class)
private Date physicalExamDate;
-
- @FieldInfo(name = "physicalExamType", type = "varchar", explain = "体检类型")
- @TableField("physicalExamType")
- @ExcelField(value = "体检类型", writeConverterExp = "1=入职体检,2=员工体检")
- private String physicalExamType = "";
-
+
+ @FieldInfo(name = "physicalExamTypeName", type = "varchar", explain = "体检类型")
+ @TableField(exist = false)
+ @ExcelField(value = "体检类型")
+ private String physicalExamTypeName = "";
+
@FieldInfo(name = "bloodPressure", type = "varchar", explain = "血压")
@TableField("bloodPressure")
@ExcelField(value = "血压")
private String bloodPressure = "";
-
+
@FieldInfo(name = "transaminase", type = "varchar", explain = "转氨酶")
@TableField("transaminase")
@ExcelField(value = "转氨酶")
private String transaminase = "";
-
- @FieldInfo(name = "ecg", type = "varchar", explain = "心电图")
- @TableField("ecg")
+
+ @FieldInfo(name = "ecgName", type = "varchar", explain = "心电图")
+ @TableField(exist = false)
@ExcelField(value = "心电图")
- private String ecg = "";
-
+ private String ecgName = "";
+
@FieldInfo(name = "conclusion", type = "varchar", explain = "体检结论")
@TableField("conclusion")
@ExcelField(value = "体检结论")
@@ -132,6 +119,38 @@
@TableField("remark")
@ExcelField(value = "备注")
private String remark = "";
+
+ @FieldInfo(name = "physicalExamType", type = "varchar", explain = "体检类型")
+ @TableField("physicalExamType")
+ private String physicalExamType = "";
+
+ @FieldInfo(name = "ecg", type = "varchar", explain = "心电图")
+ @TableField("ecg")
+ private String ecg = "";
+
+ @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+ @TableField("empStatus")
+// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
+ private String empStatus = "";
+
+
+
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
+
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
+ @TableField("deptName")
+ private String deptName = "";
+
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
+
+
+
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -167,12 +186,9 @@
@TableField(exist = false)
private String physicalExamDateStr = "";
- @FieldInfo(name = "physicalExamTypeName", type = "varchar", explain = "体检类型")
- @TableField(exist = false)
- private String physicalExamTypeName = "";
+
- @FieldInfo(name = "ecgName", type = "varchar", explain = "心电图")
- @TableField(exist = false)
- private String ecgName = "";
+
+
}
--
Gitblit v1.8.0