From 0532f8fe46864a09a0febeb6550aea2de42a4ab8 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 09:20:15 +0800
Subject: [PATCH] 提交
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
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 307da65..991afd1 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
@@ -37,11 +37,11 @@
public class EmpDimissionAttend implements Serializable {
private static final long serialVersionUID = 6080263775807562989L;
- @FieldInfo(name = "dimissionAttendId", type = "bigint", explain = "离职当月考勤Id")
+ //@FieldInfo(name = "dimissionAttendId", type = "bigint", explain = "离职当月考勤Id")
@TableId(value = "dimissionAttendId")
private Long dimissionAttendId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -54,7 +54,7 @@
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
@@ -70,7 +70,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -79,7 +79,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -87,7 +87,7 @@
@TableField("jobName")
@ExcelField(value = "岗位名称")
private String jobName = "";
-
+
@FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
@TableField(exist = false)
@ExcelField(value = "考勤年份")
@@ -118,43 +118,43 @@
@ExcelField(value = "请假（天）")
private BigDecimal leaveDay = BigDecimal.ZERO;
- @FieldInfo(name = "deduct", type = "decimal", explain = "有无代扣款项")
+ @FieldInfo(name = "deduct", type = "varchar", explain = "有无代扣款项")
@TableField("deduct")
@ExcelField(value = "有无代扣款项")
- private BigDecimal deduct = BigDecimal.ZERO;
+ private String deduct = "";
@FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）")
@TableField("absenteeism")
@ExcelField(value = "旷工（天）")
private BigDecimal absenteeism = BigDecimal.ZERO;
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -162,8 +162,8 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
private String remark = "";
-
+
@TableField(exist = false)
private String deductStr;
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0