From dcc8bb8f47544cbad6e6440640dcdaa946086013 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 17:31:54 +0800
Subject: [PATCH] feat(staff): 员工模块新增民族出生日期入职日期字段
---
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index 2db3869..4b043d1 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -53,6 +53,22 @@
private String sex;
/**
+ * 姘戞棌
+ */
+ @TableField("nation")
+ @Excel(name = "姘戞棌", sort = 23)
+ private String nation;
+
+ /**
+ * 鍑虹敓鏃ユ湡
+ */
+ @TableField("birth_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍑虹敓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 24)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date birthDate;
+
+ /**
* 绫嶈疮
*/
@Excel(name = "绫嶈疮", sort = 5)
@@ -63,6 +79,11 @@
*/
private Integer sysPostId;
+ /**
+ * 閮ㄩ棬
+ */
+ private Integer sysDeptId;
+
/**
* 瀹跺涵浣忓潃
*/
@@ -72,56 +93,65 @@
/**
* 绗竴瀛﹀巻
*/
- @Excel(name = "绗竴瀛﹀巻", sort = 8)
+ @Excel(name = "绗竴瀛﹀巻", sort = 9)
private String firstStudy;
/**
* 涓撲笟
*/
- @Excel(name = "涓撲笟", sort = 9)
+ @Excel(name = "涓撲笟", sort = 10)
private String profession;
/**
* 韬唤璇佸彿鐮�
*/
- @Excel(name = "韬唤璇佸彿鐮�", sort = 10)
+ @Excel(name = "韬唤璇佸彿鐮�", sort = 11)
private String identityCard;
/**
* 骞撮緞
*/
- @Excel(name = "骞撮緞", sort = 11)
+ @Excel(name = "骞撮緞", sort = 12)
private String age;
/**
* 鑱旂郴鐢佃瘽
*/
- @Excel(name = "鑱旂郴鐢佃瘽", sort = 12)
+ @Excel(name = "鑱旂郴鐢佃瘽", sort = 13)
private String phone;
+
+ /**
+ * 鍏ヨ亴鏃ユ湡
+ */
+ @TableField("entry_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍏ヨ亴鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 25)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date entryDate;
/**
* 绱ф�ヨ仈绯讳汉
*/
- @Excel(name = "绱ф�ヨ仈绯讳汉", sort = 13)
+ @Excel(name = "绱ф�ヨ仈绯讳汉", sort = 14)
private String emergencyContact;
/**
* 绱ф�ヨ仈绯讳汉鐢佃瘽
*/
- @Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽", sort = 14)
+ @Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽", sort = 15)
private String emergencyContactPhone;
/**
* 鍚堝悓骞撮檺
*/
- @Excel(name = "鍚堝悓骞撮檺", sort = 15)
+ @Excel(name = "鍚堝悓骞撮檺", sort = 16)
private String contractTerm;
/**
* 鍚堝悓鍒版湡鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 16)
+ @Excel(name = "鍚堝悓鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 17)
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractExpireTime;
@@ -129,7 +159,7 @@
* 缁撴潫璇曠敤鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "缁撴潫璇曠敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd", sort = 17)
+ @Excel(name = "缁撴潫璇曠敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd", sort = 18)
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date trialEndDate;
@@ -137,7 +167,7 @@
* 寮�濮嬭瘯鐢ㄦ棩鏈�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "寮�濮嬭瘯鐢ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd", sort = 18)
+ @Excel(name = "寮�濮嬭瘯鐢ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd", sort = 19)
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date trialStartDate;
@@ -145,7 +175,7 @@
* 绛捐鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "绛捐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd", sort = 19)
+ @Excel(name = "绛捐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd", sort = 20)
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date signDate;
@@ -158,7 +188,7 @@
/**
* 璇曠敤鏈熷伐璧�
*/
- @Excel(name = "璇曠敤鏈熷伐璧�", sort = 20)
+ @Excel(name = "璇曠敤鏈熷伐璧�", sort = 21)
private BigDecimal proSalary;
/**
@@ -170,7 +200,7 @@
/**
* 澶囨敞锛堢鍒╁緟閬囷級
*/
- @Excel(name = "澶囨敞锛堢鍒╁緟閬囷級", sort = 21)
+ @Excel(name = "澶囨敞锛堢鍒╁緟閬囷級", sort = 22)
private String remark;
--
Gitblit v1.9.3