From bfeab0c9d94480f4e742d311d168c79572b78745 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 08 三月 2021 16:59:02 +0800
Subject: [PATCH] Merge branch '查询条件修改'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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 0c344f5..74eeb93 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,11 +38,11 @@
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;
@@ -55,7 +55,7 @@
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
@@ -71,7 +71,7 @@
@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;
@@ -80,7 +80,7 @@
@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;
@@ -237,33 +237,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;
@@ -271,12 +271,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)
@@ -284,14 +284,14 @@
@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