From 8a2f817bc1a489f873e048d36e24f355bdb55756 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 05 三月 2021 15:44:05 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java | 242 +++++++++++++++++++++++++++++------------------
1 files changed, 149 insertions(+), 93 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
index d9d3387..4dd81e0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
@@ -1,120 +1,176 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
- import java.math.BigDecimal;
+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.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.math.BigDecimal;
+
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
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;
/**
-*
-* name:EmpLabortrouble
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工劳资案件数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:59
-* @since JDK1.8
-*/
+ * name:EmpLabortrouble
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工劳资案件数据表映射实体
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:36
+ * @since JDK1.8
+ */
@Data
@TableName("t_emp_labortrouble")
-public class EmpLaborTrouble {
+@Excel("员工劳资案件")
+public class EmpLaborTrouble implements Serializable {
- /**
- * 仲裁Id
- */
- @TableId(value = "arbitrationId", type = IdType.AUTO)
- private String arbitrationId;
+ private static final long serialVersionUID = -7587978188799851715L;
+ @FieldInfo(name = "arbitrationId", type = "bigint", explain = "仲裁Id")
+ @TableId(value = "arbitrationId")
+ private Long arbitrationId = 0L;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- * 仲裁日期
- */
- @TableField("arbitrationDate")
- private Date arbitrationDate;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ @ExcelField(value = "员工编号")
+ private String empNumb = "";
- /**
- * 仲裁类型
- */
- @TableField("arbitrationType")
- private String arbitrationType;
+ @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 = "";
- /**
- * 仲裁事由
- */
- @TableField("arbitrationReason")
- private String arbitrationReason;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
- /**
- * 报备人
- */
- @TableField("reporter")
- private String reporter;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
+ private String certificateNumb = "";
- /**
- * 仲裁赔付（元）
- */
- @TableField("arbitrationPay")
- private BigDecimal arbitrationPay;
- /**
- * 仲裁状态
- */
- @TableField("arbitrationStatus")
- private Integer arbitrationStatus;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 案结日期
- */
- @TableField("settleDate")
- private Date settleDate;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ @ExcelField(value = "部门名称")
+ private String deptName = "";
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ @ExcelField(value = "岗位名称")
+ private String jobName = "";
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "arbitrationDate", type = "date", explain = "仲裁日期")
+ @TableField("arbitrationDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "仲裁日期", writeConverter = TimeConverter.class)
+ private Date arbitrationDate;
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "arbitrationType", type = "varchar", explain = "仲裁类型")
+ @TableField("arbitrationType")
+ @ExcelField(value = "仲裁类型", writeConverterExp = "01=未报告,02=民事纠纷,03=合同纠纷")
+ private String arbitrationType = "";
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "arbitrationTypeName", type = "varchar", explain = "仲裁类型")
+ @TableField(exist = false)
+ private String arbitrationTypeName = "";
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "arbitrationReason", type = "varchar", explain = "仲裁事由")
+ @TableField("arbitrationReason")
+ @ExcelField(value = "仲裁事由")
+ private String arbitrationReason = "";
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
+ @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
+ @TableField("reporter")
+ @ExcelField(value = "报备人")
+ private String reporter = "";
+
+ @FieldInfo(name = "arbitrationPay", type = "decimal", explain = "仲裁赔付（元）")
+ @TableField("arbitrationPay")
+ @ExcelField(value = "仲裁赔付（元）")
+ private BigDecimal arbitrationPay = BigDecimal.ZERO;
+
+ @FieldInfo(name = "arbitrationStatus", type = "bit", explain = "仲裁状态")
+ @TableField("arbitrationStatus")
+ private Integer arbitrationStatus = 0;
+
+ @FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
+ @TableField("settleDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
+ private Date settleDate;
+
+ @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 = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ @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 = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ private String remark = "";
+
+ @TableField(exist = false)
+ private String arbitrationDateStr= "";
+
+ @TableField(exist = false)
+ private String settleDateStr= "";
}
\ No newline at end of file
--
Gitblit v1.8.0