From b97dc921008fc61a7e0d9de04dbce2956e65e178 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期二, 10 三月 2026 12:46:53 +0800
Subject: [PATCH] feat(hr): 添加员工转正和退休管理功能
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 dea2a32..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
@@ -25,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")
@@ -47,12 +47,33 @@
@ExcelField(value = "修改时间", writeConverter = TimeConverter.class)
private Date modifyTime;
- @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 = "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