From 69e6ce2211b96da8466912a57178f6324cb197ef Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 02 六月 2021 20:59:01 +0800
Subject: [PATCH] fix(bug修复): 增加了请假类型查询项
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 131 +++++++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 62 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
index e919ffc..b224015 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
@@ -1,24 +1,24 @@
package cc.mrbird.febs.server.hr.entity;
-import java.io.Serializable;
-import java.util.Date;
-
import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
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;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* name:EmpInsurance
@@ -48,25 +48,76 @@
@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 = "姓名")
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 = "applayDate", type = "date", explain = "申请日期")
+ @TableField("applayDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "社保申请日期", writeConverter = TimeConverter.class)
+ private Date applayDate;
+
+ @FieldInfo(name = "proposer", type = "varchar", explain = "申请人")
+ @TableField("proposer")
+ @ExcelField(value = "申请人")
+ private String proposer = "";
+
+ @FieldInfo(name = "insuranceGaers", type = "varchar", explain = "社保档位")
+ @TableField("insuranceGaers")
+ private String insuranceGaers = "";
+
+ @ExcelField(value = "社保档位")
+ @TableField(exist = false)
+ private String insuranceGaersName = "";
+
+ @FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告1-未报告 2-已报告")
+ @TableField("reportStatus")
+ @ExcelField(value = "是否已报告", writeConverterExp = "1=未报告,2=已报告")
+ private Integer reportStatus = 0;
+
+ @FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 1-未申请 2-已申请")
+ @TableField("applayStatus")
+ @ExcelField(value = "状态", writeConverterExp = "1=未申请,2=已申请")
+ private Integer applayStatus = 0;
+
+ @FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
+ @TableField("auditor")
+ @ExcelField(value = "审核人")
+ private String auditor = "";
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ @ExcelField(value = "备注")
+ private String remark = "";
+
+ @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 = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
@@ -80,46 +131,11 @@
@TableField("JobId")
private Long jobId = 0L;
- @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
- @TableField("jobName")
- @ExcelField(value = "岗位名称")
- private String jobName = "";
-
- @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
- @TableField("applayDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "申请日期", writeConverter = TimeConverter.class)
- private Date applayDate;
-
- @FieldInfo(name = "proposer", type = "varchar", explain = "申请人")
- @TableField("proposer")
- @ExcelField(value = "申请人")
- private String proposer = "";
-
- @FieldInfo(name = "insuranceGaers", type = "varchar", explain = "社保档位")
- @TableField("insuranceGaers")
- @ExcelField(value = "社保档位")
- private String insuranceGaers = "";
-
- @FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告 0-未报告 1-已报告")
- @TableField("reportStatus")
- @ExcelField(value = "是否已报告", writeConverterExp = "0=未报告,1=已报告")
- private Integer reportStatus = 0;
@TableField(exist = false)
private String reportStatusName ;
- @FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 0-未申请 1-已申请")
- @TableField("applayStatus")
- @ExcelField(value = "申请状态", writeConverterExp = "0=未申请,1=已申请")
- private Integer applayStatus = 0;
@TableField(exist = false)
private String applayStatusName ;
- @FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
- @TableField("auditor")
- @ExcelField(value = "审核人")
- private String auditor = "";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -149,18 +165,9 @@
//@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 applayDateStr;
-
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
}
--
Gitblit v1.8.0