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/dto/StaffOnJobImportDto.java | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobImportDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobImportDto.java
index 9d7e574..d3e7e39 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobImportDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobImportDto.java
@@ -5,7 +5,6 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-import java.math.BigDecimal;
import java.util.Date;
@Data
@@ -14,53 +13,53 @@
@Excel(name = "鍛樺伐缂栧彿", cellType = Excel.ColumnType.STRING, sort = 1)
private String staffNo;
- @Excel(name = "鍛樺伐濮撳悕", sort = 2)
+ @Excel(name = "濮撳悕", sort = 2)
private String staffName;
- @Excel(name = "鎬у埆", sort = 3, combo = {"鐢�", "濂�"})
+ @Excel(name = "鎬у埆", sort = 3, combo = {"male", "female"})
private String sex;
- @Excel(name = "绫嶈疮", sort = 4)
- private String nativePlace;
+ @Excel(name = "姘戞棌", sort = 4)
+ private String nation;
- @Excel(name = "宀椾綅", sort = 5, prompt = "璇峰～鍐欑郴缁熶腑宸插瓨鍦ㄧ殑宀椾綅鍚嶇О")
- private String postName;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍑虹敓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 5)
+ private Date birthDate;
- @Excel(name = "閮ㄩ棬", sort = 6, prompt = "璇峰～鍐欑郴缁熶腑宸插瓨鍦ㄧ殑閮ㄩ棬鍚嶇О")
- private String deptName;
+ @Excel(name = "韬唤璇佸彿", cellType = Excel.ColumnType.STRING, sort = 6)
+ private String identityCard;
@Excel(name = "鐜颁綇鍧�", sort = 7)
private String adress;
- @Excel(name = "绗竴瀛﹀巻", sort = 8)
- private String firstStudy;
-
- @Excel(name = "涓撲笟", sort = 9)
- private String profession;
-
- @Excel(name = "骞撮緞", sort = 11)
- private String age;
-
- @Excel(name = "鑱旂郴鐢佃瘽", cellType = Excel.ColumnType.STRING, sort = 12)
+ @Excel(name = "鑱旂郴鐢佃瘽", cellType = Excel.ColumnType.STRING, sort = 8)
private String phone;
- @Excel(name = "绱ф�ヨ仈绯讳汉", sort = 13)
- private String emergencyContact;
-
- @Excel(name = "绱ф�ヨ仈绯讳汉鑱旂郴鐢佃瘽", cellType = Excel.ColumnType.STRING, sort = 14)
+ @Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽", cellType = Excel.ColumnType.STRING, sort = 9)
private String emergencyContactPhone;
- @Excel(name = "鍚堝悓骞撮檺", sort = 15)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍏ヨ亴鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 10)
+ private Date entryDate;
+
+ @Excel(name = "宀椾綅", sort = 11, prompt = "Fill enabled post name")
+ private String postName;
+
+ @Excel(name = "閮ㄩ棬", sort = 12, prompt = "Fill enabled department name")
+ private String deptName;
+
+ @Excel(name = "鍚堝悓骞撮檺", sort = 13)
private String contractTerm;
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓寮�濮嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd", sort = 16)
+ @Excel(name = "鍚堝悓寮�濮嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd", sort = 14)
private Date contractStartTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 17)
+ @Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", sort = 15)
private Date contractEndTime;
-
}
--
Gitblit v1.9.3