From 543941f345319f29f92d9be2529d41868bc3cf80 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 18 六月 2021 15:03:26 +0800
Subject: [PATCH] fix(bug修复): 相关证件多项查询修改
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 143 +++++++++++++++++++++++++++++++----------------
1 files changed, 93 insertions(+), 50 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..8e6ee52 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,106 +33,147 @@
*/
@Data
@TableName("t_emp_dimissionattend")
+@Excel("离职当月考勤")
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;
- @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
+ @ExcelField(value = "编号")
private String empNumb = "";
-
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
- @TableField("empName")
- private String empName = "";
-
- @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
- @TableField("sex")
- private String sex = "";
-
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
- @TableField("certificateNumb")
- private String certificateNumb = "";
-
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
- @TableField("deptId")
- private Long deptId = 0L;
-
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
- @TableField("deptName")
- private String deptName = "";
-
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
- @TableField("JobId")
- private Long jobId = 0L;
-
+
+ @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 = "attendMonth", type = "tinyint", explain = "离职考勤月份")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
+ @TableField("empName")
+ @ExcelField(value = "姓名")
+ private String empName = "";
+
+ @FieldInfo(name = "attendMonth", type = "varchar", explain = "离职考勤月份")
@TableField("attendMonth")
- private Integer attendMonth = 0;
-
- @FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
- @TableField("overtimeHour")
- private BigDecimal overtimeHour = BigDecimal.ZERO;
-
+ @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 = "deduct", type = "decimal", explain = "有无代扣款项")
- @TableField("deduct")
- private BigDecimal deduct = 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 = "createTime", type = "datetime", explain = "记录创建时间")
+ @FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
+ @TableField("attendYear")
+// @ExcelField(value = "考勤年份")
+ private String attendYear = "";
+
+
+ @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")
+ @TableField("deptId")
+ private Long deptId = 0L;
+
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
+ @TableField("deptName")
+ private String deptName = "";
+
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
+
+
+ //@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
+ // @Version
private Integer version = 0;
- @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