From 906f38b1427bd6ee6506723e5d2ae09137dbbe5b Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 26 二月 2021 00:25:17 +0800
Subject: [PATCH] 年龄查询改成或的关系
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 79ad45e..bd0836a 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
@@ -4,12 +4,15 @@
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.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;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_insurance")
+@Excel("员工社保申请")
public class EmpInsurance implements Serializable {
private static final long serialVersionUID = 208703298339870887L;
@@ -41,22 +45,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")
@@ -65,6 +74,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -73,6 +83,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
@@ -80,26 +91,32 @@
@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;
@FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 0-未申请 1-已申请")
@TableField("applayStatus")
+ @ExcelField(value = "申请状态", writeConverterExp = "0=未申请,1=已申请")
private Integer applayStatus = 0;
@FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
@TableField("auditor")
+ @ExcelField(value = "审核人")
private String auditor = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
--
Gitblit v1.8.0