From 1e0c5d41572d5774d589c87250a0626081068d6f Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 03 二月 2021 10:04:25 +0800
Subject: [PATCH] feat(人力和系统微服务): 补传代码
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
index 438ea29..1e7c15f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
@@ -35,7 +35,7 @@
private static final long serialVersionUID = 5704201515491620531L;
@FieldInfo(name = "occupationalId", type = "bigint", explain = "案件Id")
- @TableField("occupationalId")
+ @TableId("occupationalId")
private Long occupationalId = 0L;
@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@@ -74,7 +74,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 +89,7 @@
@TableField("injuredPart")
private String injuredPart = "";
- @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "")
+ @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "受伤诊断")
@TableField("injuredDiacrisis")
private String injuredDiacrisis = "";
@@ -113,18 +113,18 @@
@TableField("bedNumb")
private Integer bedNumb = 0;
- @FieldInfo(name = "reprotTime", type = "date", explain = "报案时间")
- @TableField("reprotTime")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date reprotTime;
-
- @FieldInfo(name = "submitTime", type = "datetime", explain = "")
- @TableField("submitTime")
+ @FieldInfo(name = "reportTime", type = "datetime", explain = "报案时间")
+ @TableField("reportTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date reportTime;
+
+ @FieldInfo(name = "submitTime", type = "datetime", explain = "资料递交日期")
+ @TableField("submitTime")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date submitTime;
@FieldInfo(name = "sbumitBy", type = "varchar", explain = "递交人")
@@ -170,7 +170,7 @@
@TableField("otherCompensated")
private BigDecimal otherCompensated = BigDecimal.ZERO;
- @FieldInfo(name = "companylDisability", type = "decimal", explain = "")
+ @FieldInfo(name = "companylDisability", type = "decimal", explain = "公司一次性伤残补助金")
@TableField("companylDisability")
private BigDecimal companylDisability = BigDecimal.ZERO;
--
Gitblit v1.8.0