From 4af0750c19cf7d968c159e0634c88d35e09d83f7 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 05 三月 2021 22:35:46 +0800
Subject: [PATCH] fix(工作简历录入): 保存时部门id和岗位id保存不正确
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
index 57fa6ce..1e1c6fb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
@@ -4,6 +4,7 @@
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;
@@ -13,6 +14,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,6 +34,7 @@
*/
@Data
@TableName("t_emp_accidentcases")
+@Excel("员工意外险案件")
public class EmpAccidentCases implements Serializable {
private static final long serialVersionUID = 3423747469056866015L;
@@ -44,18 +48,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")
@@ -64,6 +77,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -72,75 +86,91 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
- @FieldInfo(name = "injuredTime", type = "datetime", explain = "")
+ @FieldInfo(name = "injuredTime", type = "datetime", explain = "受伤时间")
@TableField("injuredTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelField(value = "受伤时间", writeConverter = TimeConverter.class)
private Date injuredTime;
@FieldInfo(name = "injuredAddress", type = "varchar", explain = "受伤地点")
@TableField("injuredAddress")
+ @ExcelField(value = "受伤地点")
private String injuredAddress = "";
@FieldInfo(name = "injuredPart", type = "varchar", explain = "受伤部位")
@TableField("injuredPart")
+ @ExcelField(value = "受伤部位")
private String injuredPart = "";
- @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "")
+ @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "意外险诊断")
@TableField("injuredDiacrisis")
+ @ExcelField(value = "意外险诊断")
private String injuredDiacrisis = "";
@FieldInfo(name = "injuredDescribe", type = "varchar", explain = "受伤经过描述")
@TableField("injuredDescribe")
+ @ExcelField(value = "受伤经过描述")
private String injuredDescribe = "";
@FieldInfo(name = "hospitalName", type = "varchar", explain = "就诊医院")
@TableField("hospitalName")
+ @ExcelField(value = "就诊医院")
private String hospitalName = "";
@FieldInfo(name = "treatmentName", type = "varchar", explain = "就诊科室")
@TableField("treatmentName")
+ @ExcelField(value = "就诊科室")
private String treatmentName = "";
@FieldInfo(name = "hospitalizatioFlag", type = "bit", explain = "是否住院")
@TableField("hospitalizatioFlag")
+ @ExcelField(value = "是否住院", writeConverterExp = "0=未住院,1=已住院")
private Integer hospitalizatioFlag = 0;
- @FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
+ @FieldInfo(name = "bedNumb", type = "varchar", explain = "床号")
@TableField("bedNumb")
- private Integer bedNumb = 0;
+ @ExcelField(value = "床号")
+ private String bedNumb = "";
@FieldInfo(name = "reprotTime", type = "date", explain = "报案时间")
@TableField("reprotTime")
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "报案时间", writeConverter = TimeConverter.class)
private Date reprotTime;
- @FieldInfo(name = "submitTime", type = "datetime", explain = "")
+ @FieldInfo(name = "submitTime", type = "datetime", explain = "资料提交日期")
@TableField("submitTime")
- @JsonSerialize(using = DateTimeSerializer.class)
- @JsonDeserialize(using = DateTimeDeserializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "资料提交日期", writeConverter = TimeConverter.class)
private Date submitTime;
@FieldInfo(name = "sbumitBy", type = "varchar", explain = "递交人")
@TableField("sbumitBy")
+ @ExcelField(value = "递交人")
private String sbumitBy = "";
@FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
@TableField("expensesFee")
+ @ExcelField(value = "医疗总费用")
private BigDecimal expensesFee = BigDecimal.ZERO;
@FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
@TableField("expenseReport")
+ @ExcelField(value = "报单号")
private String expenseReport = "";
- @FieldInfo(name = "innsureFee", type = "decimal", explain = "")
+ @FieldInfo(name = "innsureFee", type = "decimal", explain = "保险赔付费用")
@TableField("innsureFee")
+ @ExcelField(value = "保险赔付费用")
private BigDecimal innsureFee = BigDecimal.ZERO;
@FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
@@ -148,6 +178,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "人事处理时间", writeConverter = TimeConverter.class)
private Date hrDoDate;
@FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
@@ -155,14 +186,17 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
private Date settleDate;
@FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
@TableField("settleStatus")
+ @ExcelField(value = "结案状态", writeConverterExp = "0=未结案,1=已结案")
private Integer settleStatus = 0;
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
+ @ExcelField(value = "备注")
private String remark = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -195,5 +229,10 @@
@TableField("version")
@Version
private Integer version = 0;
-
+
+ @TableField(exist = false)
+ private String injuredTimeStr;
+
+ @TableField(exist = false)
+ private String hrDoDateStr;
}
\ No newline at end of file
--
Gitblit v1.8.0