From 6edba268da4799fa3ebea904dfb21e6bef88ee6d Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 11 三月 2021 11:24:07 +0800
Subject: [PATCH] fix(bug修复): 员工信息列表排序
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
index 6c8b402..ea466db 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.common.core.entity.system;
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.converter.TimeConverter;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -24,7 +25,7 @@
public static final Long TOP_DEPT_ID = 0L;
private static final long serialVersionUID = -7790334862410409053L;
- @TableId(value = "DEPT_ID", type = IdType.AUTO)
+ @TableId(value = "DEPT_ID")
private Long deptId;
@TableField(value = "PARENT_ID")
@@ -46,8 +47,33 @@
@ExcelField(value = "修改时间", writeConverter = TimeConverter.class)
private Date modifyTime;
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "deptType", type = "varchar", explain = "部门类型")
+ @TableField("deptType")
+ private String deptType = "部门类型";
+
+ @FieldInfo(name = "deptTypeName", type = "varchar", explain = "部门类型")
+ @TableField(exist = false)
+ private String deptTypeName;
+
+ @FieldInfo(name = "deptFunction", type = "varchar", explain = "部门职能")
+ @TableField("deptFunction")
+ private String deptFunction = "04";
+
+ @FieldInfo(name = "deptFunctionName", type = "varchar", explain = "部门职能")
+ @TableField(exist = false)
+ private String deptFunctionName;
+
+ @FieldInfo(name = "allDeptName", type = "varchar", explain = "部门全称")
+ @TableField("allDeptName")
+ private String allDeptName = "";
+
+
private transient String createTimeFrom;
private transient String createTimeTo;
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0