From b3024fd012fc39bc0cbe52a5775748df428fe5ee Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 12 三月 2021 09:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 62 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 27 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 828a8c6..2028f71 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
@@ -38,24 +38,24 @@
public class EmpOccupational implements Serializable {
private static final long serialVersionUID = 5704201515491620531L;
- @FieldInfo(name = "occupationalId", type = "bigint", explain = "案件Id")
+ //@FieldInfo(name = "occupationalId", type = "bigint", explain = "案件Id")
@TableId("occupationalId")
private Long occupationalId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@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 = "员工姓名")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
@@ -66,21 +66,20 @@
@ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -131,11 +130,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")
@@ -236,33 +236,33 @@
@ExcelField(value = "是否已报告", writeConverterExp = "0=未结案,1=已结案")
private Integer settleStatus = 0;
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -270,12 +270,12 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@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)
@@ -283,11 +283,19 @@
@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= "";
-}
\ No newline at end of file
+ @FieldInfo(name = "settleStatusName", type = "bit", explain = "结案状态 0-未结案 1-已结案")
+ @TableField(exist = false)
+ private String settleStatusName = "";
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+}
--
Gitblit v1.8.0