From e775c15fde0024a897608e0ceaaed5c0c3f10850 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 09 四月 2021 00:42:59 +0800
Subject: [PATCH] fix(人力微服务): 修改上传文件方式
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 121 +++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 57 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 807f51a..9257235 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
@@ -47,27 +47,84 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ @ExcelField(value = "岗位")
+ private String jobName = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
+
+ @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 = "overtimeDay", type = "decimal", explain = "加班（天）")
+ @TableField("overtimeDay")
+ @ExcelField(value = "加班（天）")
+ private BigDecimal overtimeDay = BigDecimal.ZERO;
+
+ @FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
+ @TableField("overtimeHour")
+ @ExcelField(value = "加班（小时）")
+ private BigDecimal overtimeHour = BigDecimal.ZERO;
+
+ @FieldInfo(name = "deduct", type = "varchar", explain = "有无代扣款项")
+ @TableField("deduct")
+ @ExcelField(value = "有无代扣款项")
+ private String deduct = "";
+
+ @FieldInfo(name = "leaveDay", type = "decimal", explain = "请假（天）")
+ @TableField("leaveDay")
+ @ExcelField(value = "请假（天）")
+ private BigDecimal leaveDay = BigDecimal.ZERO;
+
+ @FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）")
+ @TableField("absenteeism")
+ @ExcelField(value = "旷工（天）")
+ private BigDecimal absenteeism = BigDecimal.ZERO;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ @ExcelField(value = "备注")
+ private String remark = "";
+
+
+ @FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
+ @TableField(exist = false)
+// @ExcelField(value = "考勤年份")
+ private String attendYear = "";
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
- @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
+// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+// @ExcelField(value = "身份证号码")
private String certificateNumb = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -76,57 +133,13 @@
@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 = "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 = "varchar", explain = "有无代扣款项")
- @TableField("deduct")
- @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 = "记录创建时间")
@TableField("createTime")
@@ -159,14 +172,8 @@
@Version
private Integer version = 0;
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
-
@TableField(exist = false)
private String deductStr;
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
--
Gitblit v1.8.0