From 2011089c5eecbb2bfebba4f738e513bd88ab6b96 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 21 二月 2021 00:14:55 +0800
Subject: [PATCH] feat(信息录入): 离职当月考勤
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 7c86b27..3ecc1c9 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
@@ -49,6 +49,10 @@
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
private String empName = "";
+
+ @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+ @TableField("empStatus")
+ private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
@@ -73,10 +77,18 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
private String jobName = "";
+
+ @FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
+ @TableField(exist = false)
+ private String attendYear = "";
- @FieldInfo(name = "attendMonth", type = "tinyint", explain = "离职考勤月份")
+ @FieldInfo(name = "attendMonth", type = "varchar", explain = "离职考勤月份")
@TableField("attendMonth")
- private Integer attendMonth = 0;
+ private String attendMonth = "";
+
+ @FieldInfo(name = "attendDays", type = "decimal", explain = "出勤天数")
+ @TableField("attendDays")
+ private BigDecimal attendDays = BigDecimal.ZERO;
@FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
@TableField("overtimeHour")
@@ -90,9 +102,9 @@
@TableField("leaveDay")
private BigDecimal leaveDay = BigDecimal.ZERO;
- @FieldInfo(name = "deduct", type = "decimal", explain = "有无代扣款项")
+ @FieldInfo(name = "deduct", type = "varchar", explain = "有无代扣款项")
@TableField("deduct")
- private BigDecimal deduct = BigDecimal.ZERO;
+ private String deduct = "";
@FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）")
@TableField("absenteeism")
@@ -132,5 +144,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