From c4d8a0ec627cfc0a0e1d14501a2f9ae188e226b4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 15 Jan 2024 17:15:29 +0800
Subject: [PATCH] 用户模板导入
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 4 ++++
src/main/java/org/springblade/common/enums/DictEnum.java | 4 ++++
src/main/java/org/springblade/modules/system/excel/UserExcel.java | 27 +++++++++++++++++++++++++++
src/main/java/org/springblade/modules/system/entity/User.java | 2 +-
4 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/common/enums/DictEnum.java b/src/main/java/org/springblade/common/enums/DictEnum.java
index 84f3096..6b15655 100644
--- a/src/main/java/org/springblade/common/enums/DictEnum.java
+++ b/src/main/java/org/springblade/common/enums/DictEnum.java
@@ -88,6 +88,10 @@
* 用户平台
*/
USER_TYPE("user_type"),
+ EDUCATION_BACKGROUND("education_background"),
+ EMPLOYEE_TYPE("employee_type"),
+
+
;
final String name;
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 120c4f8..33ecf7c 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -82,7 +82,7 @@
/**
* 入职时间
*/
- private String entryJobTime;
+ private Date entryJobTime;
/**
* 生日
*/
diff --git a/src/main/java/org/springblade/modules/system/excel/UserExcel.java b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
index 9ab367c..c2d696e 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -98,4 +98,31 @@
@ExcelProperty("生日")
private Date birthday;
+ /**
+ * 身份证号码
+ */
+ @ColumnWidth(50)
+ @ExcelProperty("身份证号码")
+ private String cardNo;
+
+ /**
+ * 学历
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("学历")
+ private String educationBackground;
+
+ /**
+ * 入职时间
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("入职时间")
+ private Date entryJobTime;
+ /**
+ * 合伙人等级
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("合伙人等级")
+ private String employeeType;
+
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 4c07c77..1cb8140 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -323,6 +323,10 @@
user.setPostId(Func.toStrWithEmpty(SysCache.getPostIds(userExcel.getTenantId(), userExcel.getPostName()), StringPool.EMPTY));
// 设置角色ID
user.setRoleId(Func.toStrWithEmpty(SysCache.getRoleIds(userExcel.getTenantId(), userExcel.getRoleName()), StringPool.EMPTY));
+ // 设置员工类型
+ user.setEmployeeType(Func.toInt(DictCache.getKey(DictEnum.EMPLOYEE_TYPE, userExcel.getEmployeeType()), 1));
+ // 设置学历
+ user.setEducationBackground(Func.toStr(DictCache.getKey(DictEnum.EDUCATION_BACKGROUND, userExcel.getEducationBackground()), "1"));
// 设置租户ID
if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
user.setTenantId(AuthUtil.getTenantId());
--
Gitblit v1.9.3