diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserImportParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserImportParam.java index 5a391b97..a3f24c7f 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserImportParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserImportParam.java @@ -25,15 +25,36 @@ import lombok.Setter; @Setter public class SysUserImportParam { - /** 头像 */ - private String avatar; - /** 账号 */ private String account; /** 姓名 */ private String name; + /** 组织名称 */ + private String orgName; + + /** 职位名称 */ + private String positionName; + + /** 手机 */ + private String phone; + + /** 邮箱 */ + private String email; + + /** 主管名称 */ + private String directorName; + + /** 员工编号 */ + private String empNo; + + /** 入职日期 */ + private String entryDate; + + /** 职级 */ + private String positionLevel; + /** 昵称 */ private String nickname; @@ -82,12 +103,6 @@ public class SysUserImportParam { /** 学位 */ private String degree; - /** 手机 */ - private String phone; - - /** 邮箱 */ - private String email; - /** 家庭电话 */ private String homeTel; @@ -102,22 +117,4 @@ public class SysUserImportParam { /** 紧急联系人地址 */ private String emergencyAddress; - - /** 员工编号 */ - private String empNo; - - /** 入职日期 */ - private String entryDate; - - /** 组织名称 */ - private String orgName; - - /** 职位名称 */ - private String positionName; - - /** 主管名称 */ - private String directorName; - - /** 职级 */ - private String positionLevel; } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/resources/userImportTemplate.xlsx b/snowy-plugin/snowy-plugin-sys/src/main/resources/userImportTemplate.xlsx new file mode 100644 index 00000000..f5e5080f Binary files /dev/null and b/snowy-plugin/snowy-plugin-sys/src/main/resources/userImportTemplate.xlsx differ diff --git a/snowy-web-app/src/test/java/vip/xiaonuo/Test.java b/snowy-web-app/src/test/java/vip/xiaonuo/Test.java index 8bdc9fef..b59a9b55 100644 --- a/snowy-web-app/src/test/java/vip/xiaonuo/Test.java +++ b/snowy-web-app/src/test/java/vip/xiaonuo/Test.java @@ -30,7 +30,7 @@ public class Test { for (SysUserImportParam sysUserImportParam : dataList) { System.out.println(sysUserImportParam); } - })).sheet().doRead(); + })).sheet().headRowNumber(2).doRead(); } catch (Exception e) { e.printStackTrace(); throw new CommonException("文件导入失败");