From 096f6025e0212b23df8485b56818c3f0b019aa26 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期二, 20 四月 2021 10:40:31 +0800
Subject: [PATCH] 修复导入空行的问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 171 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 91 insertions(+), 80 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index 2f5927c..70b621b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -35,88 +35,34 @@
public class EmpContractInfo implements Serializable {
private static final long serialVersionUID = 4152214737054224645L;
- @FieldInfo(name = "contractId", type = "bigint", explain = "合同Id")
+ //@FieldInfo(name = "contractId", type = "bigint", explain = "合同Id")
@TableId(value = "contractId")
private Long contractId = 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 = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
-
- @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
- @TableField("empStatus")
- @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
- private String empStatus = "";
-
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
-
- @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")
- private Long deptId = 0L;
-
- @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 = "beginDate", type = "date", explain = "开始日期")
- @TableField("beginDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "开始日期", writeConverter = TimeConverter.class)
- private Date beginDate;
-
- @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
- @TableField("endDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "结束日期", writeConverter = TimeConverter.class)
- private Date endDate;
-
- @FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
- @TableField("contractStatus")
- @ExcelField(value = "合同状态", writeConverterExp = "1=有效,2=到期,3=续签,4=存档")
- private String contractStatus = "";
-
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
- @TableField("contractPeriod")
- @ExcelField(value = "合同期限(年)")
- private Integer contractPeriod = 0;
-
- @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
- @TableField("transactor")
- @ExcelField(value = "合同办理人")
- private String transactor = "";
-
+
@FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
@TableField("signingDate")
@JsonSerialize(using = DateSerializer.class)
@@ -124,39 +70,104 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelField(value = "合同签订日期", writeConverter = TimeConverter.class)
private Date signingDate;
+
+ @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
+ @TableField("endDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "合同结束日期", writeConverter = TimeConverter.class)
+ private Date endDate;
+
+ @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @TableField("contractPeriod")
+ @ExcelField(value = "合同期限(年)")
+ private Float contractPeriod = Float.valueOf(0);
+
+ @FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
+ @TableField(exist = false)
+ @ExcelField(value = "合同状态")
+ private String contractStatusName = "";
+
+ @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
+ @TableField("transactor")
+ @ExcelField(value = "合同办理人")
+ private String transactor = "";
+
+
+ @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")
+ 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 = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+// @ExcelField(value = "岗位名称")
+ private String jobName = "";
+
+ @FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
+ @TableField("beginDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+// @ExcelField(value = "开始日期", writeConverter = TimeConverter.class)
+ private Date beginDate;
+
+ @FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
+ @TableField("contractStatus")
+ private String contractStatus = "";
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
- @ExcelField(value = "备注")
+// @ExcelField(value = "备注")
private String remark = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@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
private Integer version = 0;
@@ -167,8 +178,8 @@
@TableField(exist = false)
private String endDateStr = "";
- @FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
- @TableField(exist = false)
- private String contractStatusName = "";
+
-}
\ No newline at end of file
+
+
+}
--
Gitblit v1.8.0