From 9c76b7efccd70395231b032a193a89f7638b657e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 22 十月 2025 17:41:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/importExcel/EmployeeImportExcel.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/EmployeeImportExcel.java b/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/EmployeeImportExcel.java
index 7bc3127..f40c1a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/EmployeeImportExcel.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/EmployeeImportExcel.java
@@ -6,6 +6,8 @@
import lombok.Data;
import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.Date;
@Data
@ApiModel(value = "员工导入Excel")
@@ -33,36 +35,36 @@
@Excel(name = "参工时间", width = 15)
@ApiModelProperty(value = "参工时间")
- private String participationTime;
+ private Date participationTime;
@Excel(name = "进入公司时间", width = 15)
@ApiModelProperty(value = "进入公司时间")
- private String companyTime;
+ private Date companyTime;
// 第一学历
- @Excel(name = "第一学历-学历", width = 15)
+ @Excel(name = "第一学历", width = 15)
@ApiModelProperty(value = "第一学历")
private String firstDegree;
@Excel(name = "第一学历-学院", width = 25)
- @ApiModelProperty(value = "第一学历学院")
+ @ApiModelProperty(value = "第一学历-学院")
private String firstCollege;
@Excel(name = "第一学历-专业", width = 25)
- @ApiModelProperty(value = "第一学历专业")
+ @ApiModelProperty(value = "第一学历-专业")
private String firstMajor;
// 最高学历
- @Excel(name = "最高学历-学历", width = 15)
+ @Excel(name = "最高学历", width = 15)
@ApiModelProperty(value = "最高学历")
private String highestDegree;
@Excel(name = "最高学历-学院", width = 25)
- @ApiModelProperty(value = "最高学历学院")
+ @ApiModelProperty(value = "最高学历-学院")
private String highestCollege;
@Excel(name = "最高学历-专业", width = 25)
- @ApiModelProperty(value = "最高学历专业")
+ @ApiModelProperty(value = "最高学历-专业")
private String highestMajor;
@Excel(name = "所在股室", width = 20)
@@ -75,7 +77,7 @@
@Excel(name = "任职时间", width = 15)
@ApiModelProperty(value = "任职时间")
- private String positionTime;
+ private Date positionTime;
@Excel(name = "电话号码", width = 15)
@ApiModelProperty(value = "电话号码")
@@ -85,15 +87,8 @@
@ApiModelProperty(value = "编制")
private String organization;
-
-
- // 部门名称（系统字段）
- @Excel(name = "部门名称", width = 20)
- @ApiModelProperty(value = "部门名称")
- private String deptName;
-
// 角色名称（系统字段）
- @Excel(name = "角色名称", width = 20)
+ @Excel(name = "角色", width = 20)
@ApiModelProperty(value = "角色名称")
private String roleName;
}
--
Gitblit v1.7.1