From 65f1296728ac4a2c207d411b50659af683628413 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 30 七月 2021 09:22:39 +0800
Subject: [PATCH] fix: 导入新员工时也同步写一条入职记录
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
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 13cdc89..b224015 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
@@ -92,12 +92,12 @@
@FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告1-未报告 2-已报告")
@TableField("reportStatus")
@ExcelField(value = "是否已报告", writeConverterExp = "1=未报告,2=已报告")
- private Integer reportStatus = 1;
+ private Integer reportStatus = 0;
@FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 1-未申请 2-已申请")
@TableField("applayStatus")
@ExcelField(value = "状态", writeConverterExp = "1=未申请,2=已申请")
- private Integer applayStatus = 1;
+ private Integer applayStatus = 0;
@FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
@TableField("auditor")
@@ -108,8 +108,6 @@
@TableField("remark")
@ExcelField(value = "备注")
private String remark = "";
-
-
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@@ -133,16 +131,11 @@
@TableField("JobId")
private Long jobId = 0L;
-
-
@TableField(exist = false)
private String reportStatusName ;
-
@TableField(exist = false)
private String applayStatusName ;
-
-
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -172,13 +165,9 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
-
-
@TableField(exist = false)
private String applayDateStr;
-
-
}
--
Gitblit v1.8.0