From e42bbb438b21ad7ef01888b7172ee5f810d2ab39 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 06 四月 2021 01:42:57 +0800
Subject: [PATCH] fix(人力微服务): 修改前端，后端判断比较多，撤回上版本操作
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java | 142 ++++++++++++++++++++++++++---------------------
1 files changed, 79 insertions(+), 63 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 7125e53..41abd87 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
@@ -46,77 +46,59 @@
@TableField("empId")
private Long empId = 0L;
- @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @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")
- @TableField("deptId")
- private Long deptId = 0L;
-
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
- @TableField("deptName")
- @ExcelField(value = "部门名称")
- private String deptName = "";
-
- //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
- @TableField("JobId")
- private Long jobId = 0L;
-
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
- @ExcelField(value = "岗位名称")
+ @ExcelField(value = "岗位")
private String jobName = "";
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
+ @TableField("empName")
+ @ExcelField(value = "姓名")
+ private String empName = "";
+
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
+ @TableField("certificateNumb")
+ @ExcelField(value = "身份证号码")
+ private String certificateNumb = "";
+
@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)
+ @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 = "意外险诊断")
- @TableField("injuredDiacrisis")
- @ExcelField(value = "意外险诊断")
- private String injuredDiacrisis = "";
-
+
@FieldInfo(name = "injuredDescribe", type = "varchar", explain = "受伤经过描述")
@TableField("injuredDescribe")
@ExcelField(value = "受伤经过描述")
private String injuredDescribe = "";
-
+
+ @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "意外险诊断")
+ @TableField("injuredDiacrisis")
+ @ExcelField(value = "意外险诊断")
+ private String injuredDiacrisis = "";
+
@FieldInfo(name = "hospitalName", type = "varchar", explain = "就诊医院")
@TableField("hospitalName")
@ExcelField(value = "就诊医院")
@@ -131,13 +113,12 @@
@TableField("hospitalizatioFlag")
@ExcelField(value = "是否住院", writeConverterExp = "0=未住院,1=已住院")
private Integer hospitalizatioFlag = 0;
- @TableField(exist = false)
- private String hospitalizatioFlagName ;
+
@FieldInfo(name = "bedNumb", type = "varchar", explain = "床号")
@TableField("bedNumb")
@ExcelField(value = "床号")
private String bedNumb = "";
-
+
@FieldInfo(name = "reprotTime", type = "date", explain = "报案时间")
@TableField("reprotTime")
@JsonSerialize(using = DateSerializer.class)
@@ -163,16 +144,16 @@
@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 = "保险赔付费用")
@TableField("innsureFee")
@ExcelField(value = "保险赔付费用")
private BigDecimal innsureFee = BigDecimal.ZERO;
+
+ @FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
+ @TableField("expenseReport")
+ @ExcelField(value = "保单")
+ private String expenseReport = "";
@FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
@TableField("hrDoDate")
@@ -181,23 +162,56 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelField(value = "人事处理时间", writeConverter = TimeConverter.class)
private Date hrDoDate;
+
+ @FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
+ @TableField("settleStatus")
+ @ExcelField(value = "状态", writeConverterExp = "0=未结案,1=已结案")
+ private Integer settleStatus = 0;
- @FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
+ @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)
+ @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 = "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 = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
+
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
+ @TableField("deptName")
+ private String deptName = "";
+
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
+ @TableField(exist = false)
+ private String hospitalizatioFlagName ;
+
+
+ @TableField(exist = false)
+ private String settleStatusName;
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
- @ExcelField(value = "备注")
+// @ExcelField(value = "备注")
private String remark = "";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -236,4 +250,6 @@
@TableField(exist = false)
private String hrDoDateStr;
+
+
}
--
Gitblit v1.8.0