From 3cadfe55e0dcec2a02786956ad2776258e0e736c Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 19 九月 2024 19:27:05 +0800
Subject: [PATCH] fix: 问题修复 1.合同提醒时间范围
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java | 85 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 37 deletions(-)
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 8666ddb..d787aa0 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
@@ -42,60 +42,47 @@
@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 = "员工姓名")
- @TableField("empName")
- @ExcelField(value = "员工姓名")
- private String empName = "";
-
- @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
- @TableField("sex")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
- private String sex = "";
-
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
- @TableField("certificateNumb")
- @ExcelField(value = "证件号码")
- private String certificateNumb = "";
-
- //@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 = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
- @ExcelField(value = "岗位名称")
+ @ExcelField(value = "岗位")
private String jobName = "";
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
+ @TableField("empName")
+ @ExcelField(value = "姓名")
+ private String empName = "";
+
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
+ @TableField("certificateNumb")
+ @ExcelField(value = "身份证号码")
+ private String certificateNumb = "";
+
@FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
@TableField("applayDate")
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "申请日期", writeConverter = TimeConverter.class)
+ @ExcelField(value = "失业金申请日期", writeConverter = TimeConverter.class)
private Date applayDate;
-
+
@FieldInfo(name = "applayReason", type = "varchar", explain = "申报事由")
@TableField("applayReason")
@ExcelField(value = "申报事由")
private String applayReason = "";
-
+
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
- @ExcelField(value = "报备人")
+ @ExcelField(value = "汇报人")
private String reporter = "";
@FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
@@ -107,7 +94,29 @@
@TableField("remark")
@ExcelField(value = "备注")
private String remark = "";
+
+
+ @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")
+ private String deptName = "";
+
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -137,7 +146,7 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
@TableField(exist = false)
@@ -145,4 +154,6 @@
@TableField(exist = false)
private String empStatus;
+
+
}
--
Gitblit v1.8.0