From da7fc9b3e00ceed3186662a3662e296f1e581f9c Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 26 二月 2021 02:22:32 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 c99e9d9..edd0c56 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
@@ -13,6 +13,8 @@
import java.math.BigDecimal;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,6 +33,7 @@
*/
@Data
@TableName("t_emp_dimissionattend")
+@Excel("离职当月考勤")
public class EmpDimissionAttend implements Serializable {
private static final long serialVersionUID = 6080263775807562989L;
@@ -44,22 +47,27 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@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")
@@ -68,6 +76,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -76,38 +85,47 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
@TableField(exist = false)
+ @ExcelField(value = "考勤年份")
private String attendYear = "";
@FieldInfo(name = "attendMonth", type = "varchar", explain = "离职考勤月份")
@TableField("attendMonth")
+ @ExcelField(value = "考勤月份")
private String attendMonth = "";
@FieldInfo(name = "attendDays", type = "decimal", explain = "出勤天数")
@TableField("attendDays")
+ @ExcelField(value = "出勤天数")
private BigDecimal attendDays = BigDecimal.ZERO;
@FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
@TableField("overtimeHour")
+ @ExcelField(value = "加班小时")
private BigDecimal overtimeHour = BigDecimal.ZERO;
@FieldInfo(name = "overtimeDay", type = "decimal", explain = "加班（天）")
@TableField("overtimeDay")
+ @ExcelField(value = "加班（天）")
private BigDecimal overtimeDay = BigDecimal.ZERO;
@FieldInfo(name = "leaveDay", type = "decimal", explain = "请假（天）")
@TableField("leaveDay")
+ @ExcelField(value = "请假（天）")
private BigDecimal leaveDay = BigDecimal.ZERO;
- @FieldInfo(name = "deduct", type = "decimal", explain = "有无代扣款项")
+ @FieldInfo(name = "deduct", type = "varchar", explain = "有无代扣款项")
@TableField("deduct")
- private BigDecimal deduct = BigDecimal.ZERO;
+ @ExcelField(value = "有无代扣款项")
+ private String deduct = "";
@FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）")
@TableField("absenteeism")
+ @ExcelField(value = "旷工（天）")
private BigDecimal absenteeism = BigDecimal.ZERO;
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
--
Gitblit v1.8.0