yz
2021-02-19 c731b7ce86df3deb69ae853910e56bb374e92017
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")
@@ -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 = "";
@@ -113,18 +117,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 +174,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;
@@ -228,5 +232,11 @@
    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";
    @TableField(exist = false)
   private String hrDoDateStr= "";
    @TableField(exist = false)
   private String injuredTimeStr= "";
}