From 9d2111fb2449f3d2e357fe6f5dea6ceeaaed0deb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 29 四月 2026 10:35:26 +0800
Subject: [PATCH] fix(staff): 修改试用月份字段的数据类型
---
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index 19fb2bf..16b1d7c 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,7 +17,7 @@
*/
@TableName(value = "staff_on_job")
@Data
-public class StaffOnJob implements Serializable {
+public class StaffOnJob extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -34,7 +35,7 @@
/**
* 鍛樺伐缂栧彿
*/
- @Excel(name = "鍛樺伐缂栧彿")
+ @Excel(name = "鍛樺伐缂栧彿", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING)
private String staffNo;
/**
@@ -143,5 +144,46 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ /**
+ * 璇曠敤鏈堜唤
+ */
+ private Integer 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