From 341147c079523c492749f48431d16fc9d6313535 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:44:20 +0800
Subject: [PATCH] 提交调岗查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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..10ed076 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
@@ -49,6 +49,10 @@
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
private String empName = "";
+
+ @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+ @TableField("empStatus")
+ private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
@@ -74,7 +78,7 @@
@TableField("jobName")
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)
@@ -89,7 +93,7 @@
@TableField("injuredPart")
private String injuredPart = "";
- @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "")
+ @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "意外险诊断")
@TableField("injuredDiacrisis")
private String injuredDiacrisis = "";
@@ -120,11 +124,11 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
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")
private Date submitTime;
@FieldInfo(name = "sbumitBy", type = "varchar", explain = "递交人")
@@ -139,7 +143,7 @@
@TableField("expenseReport")
private String expenseReport = "";
- @FieldInfo(name = "innsureFee", type = "decimal", explain = "")
+ @FieldInfo(name = "innsureFee", type = "decimal", explain = "保险赔付费用")
@TableField("innsureFee")
private BigDecimal innsureFee = BigDecimal.ZERO;
@@ -195,5 +199,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