From eb75ecc4eacb90f786ddf2e64c00547496345eeb Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 14:41:58 +0800
Subject: [PATCH] 提交
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 e54d053..0c344f5 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
@@ -131,11 +131,12 @@
@TableField("hospitalizatioFlag")
@ExcelField(value = "是否住院", writeConverterExp = "0=未住院,1=已住院")
private Integer hospitalizatioFlag = 0;
-
- @FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
+ @TableField(exist = false)
+ private String hospitalizatioFlagName ;
+ @FieldInfo(name = "bedNumb", type = "varchar", explain = "床号")
@TableField("bedNumb")
@ExcelField(value = "床号")
- private Integer bedNumb = 0;
+ private String bedNumb = "";
@FieldInfo(name = "reportTime", type = "datetime", explain = "报案时间")
@TableField("reportTime")
@@ -271,10 +272,26 @@
@TableField("remark")
private String remark = "";
+ @FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
+ @TableField("expenseReport")
+ @ExcelField(value = "报单号")
+ private String expenseReport = "";
+
+ @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;
+
@TableField(exist = false)
private String hrDoDateStr= "";
@TableField(exist = false)
private String injuredTimeStr= "";
+ @FieldInfo(name = "settleStatusName", type = "bit", explain = "结案状态 0-未结案 1-已结案")
+ @TableField(exist = false)
+ private String settleStatusName = "";
}
\ No newline at end of file
--
Gitblit v1.8.0