From 298655c560cd54e088d6e11affda9d169f5e2b5f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 26 Aug 2021 16:34:00 +0800
Subject: [PATCH] 导入接口修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 62 +++++++++++++-----------------
src/main/java/org/springblade/modules/system/excel/UserExcel.java | 2
src/main/java/org/springblade/modules/system/controller/UserController.java | 34 +++++++++++++++++
src/main/java/org/springblade/modules/system/entity/User.java | 2
4 files changed, 63 insertions(+), 37 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 32a5d7d..ca4679f 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -407,6 +407,40 @@
@ApiOperation(value = "导出模板")
public void exportSecurity(HttpServletResponse response) {
List<UserExcel> list = new ArrayList<>();
+ UserExcel userExcel = new UserExcel();
+ userExcel.setDeptId("xxx保安公司");
+ userExcel.setRealName("张三");
+ userExcel.setEmail("xxx@**.com");
+ userExcel.setPhone("12345678901");
+ userExcel.setSex("男");
+ userExcel.setCardid("360XXX19XXXXXX****");
+ userExcel.setNativeplace("江西南昌");
+ userExcel.setNation("汉");
+ userExcel.setPoliticaloutlook("中共党员");
+ userExcel.setHeight(180);
+ userExcel.setAddress("江西省南昌市******");
+ userExcel.setRegistered("江西南昌");
+ userExcel.setRtime("2021-05-01");
+ userExcel.setHold("是");
+ userExcel.setSex("赣洪202100001");
+ list.add(userExcel);
+ UserExcel userExcel1 = new UserExcel();
+ userExcel1.setDeptId("xxx保安公司");
+ userExcel1.setRealName("李四");
+ userExcel1.setEmail("xxx@**.com");
+ userExcel1.setPhone("12345678901");
+ userExcel1.setSex("女");
+ userExcel1.setCardid("360XXX19XXXXXX****");
+ userExcel1.setNativeplace("江西南昌");
+ userExcel1.setNation("汉");
+ userExcel1.setPoliticaloutlook("中共党员");
+ userExcel1.setHeight(180);
+ userExcel1.setAddress("江西省南昌市******");
+ userExcel1.setRegistered("江西南昌");
+ userExcel1.setRtime("2021-05-01");
+ userExcel1.setHold("否");
+ userExcel1.setSex("");
+ list.add(userExcel1);
ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
}
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 bfe1a81..eb71562 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -128,7 +128,7 @@
* 身高
*/
@ApiModelProperty(value = "身高")
- private Float height;
+ private Integer height;
/**
* 联系电话
*/
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 004c5fc..56c8285 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -77,7 +77,7 @@
@ExcelProperty("身高")
- private Float height;
+ private Integer height;
@ExcelProperty("联系地址")
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 fa6b645..8657224 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
@@ -305,19 +305,8 @@
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
// 设置租户ID
user.setTenantId("000000");
- if (null != userExcel.getStatus() && userExcel.getStatus() != "") {
- if (userExcel.getStatus().equals("在职")) {
- user.setStatus(1);
- } else {
- user.setStatus(2);
- }
- }
- if (userExcel.getSex().equals("男性")) {
- user.setSex(1);
- }
- if (userExcel.getSex().equals("女性")){
- user.setSex(2);
- }
+ //默认在职
+ user.setStatus(1);
//判断是否持证
if (null != userExcel.getHold() && userExcel.getHold() != "") {
if (userExcel.getHold().equals("是")) {
@@ -336,12 +325,19 @@
user.setRoleId(oneRole.getId().toString());
}
}
- String deptname = user.getDeptId();
- String id = userDeptService.selectIn(deptname);
- user.setDeptId(id);
+ if (null!=userExcel.getSex()) {
+ if (userExcel.getSex().equals("男")) {
+ user.setSex(1);
+ }
+ if (userExcel.getSex().equals("女")) {
+ user.setSex(2);
+ }
+ }
+ //设置部门id
+ user.setDeptId(userDeptService.selectIn(user.getDeptId()));
//获取默认密码配置
- String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
- user.setPassword(initPassword);
+ user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
+ //新增
this.submit(user);
});
}
@@ -551,13 +547,8 @@
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
// 设置租户ID
user.setTenantId("000000");
- if (null != userExcel.getStatus() && userExcel.getStatus() != "") {
- if (userExcel.getStatus().equals("在职")) {
- user.setStatus(1);
- } else {
- user.setStatus(2);
- }
- }
+ //默认在职
+ user.setStatus(1);
//判断是否持证
if (null != userExcel.getHold() && userExcel.getHold() != "") {
if (userExcel.getHold().equals("是")) {
@@ -576,18 +567,19 @@
user.setRoleId(oneRole.getId().toString());
}
}
- if (userExcel.getSex().equals("男性")) {
- user.setSex(1);
- } else {
- user.setSex(2);
+ if (null!=userExcel.getSex()) {
+ if (userExcel.getSex().equals("男")) {
+ user.setSex(1);
+ }
+ if (userExcel.getSex().equals("女")) {
+ user.setSex(2);
+ }
}
-
- String deptname = user.getDeptId();
- String id = userDeptService.selectIn(deptname);
- user.setDeptId(id);
+ //设置部门id
+ user.setDeptId(userDeptService.selectIn(user.getDeptId()));
//获取默认密码配置
- String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
- user.setPassword(initPassword);
+ user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
+ //新增
this.submit(user);
});
}
--
Gitblit v1.9.3