From bfe7fe047e7682cd3c3a6c0d876a82df614ee85e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 29 四月 2026 10:32:54 +0800
Subject: [PATCH] feat(staff): 增加员工转正与调岗功能
---
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index ca54c4c..1a9fb38 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -35,7 +35,7 @@
/**
* 鍛樺伐缂栧彿
*/
- @Excel(name = "鍛樺伐缂栧彿")
+ @Excel(name = "鍛樺伐缂栧彿", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING)
private String staffNo;
/**
@@ -144,5 +144,46 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ /**
+ * 璇曠敤鏈堜唤
+ */
+ private String probationPeriod;
+
+ /**
+ * 杞鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date regularDate;
+
+ /**
+ * 璇曠敤璇勪及
+ */
+ private String assessmentResult;
+
+ /**
+ * 寤舵湡鏈堜唤鏁�
+ */
+ private String delayMonths;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+ /**
+ * 璋冨矖鏃ユ湡
+ */
+ private Date transferDate;
+
+ /**
+ * 璋冨矖绫诲瀷
+ */
+ private String transferType;
+
+ /**
+ * 璋冨矖鍘熷洜
+ */
+ private String transferReason;
+
}
--
Gitblit v1.9.3