From 8a8d4a3779b13393688f44f6ac5d8fe6d253d369 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 12 Aug 2021 20:40:25 +0800
Subject: [PATCH] 1.保安人员导入
---
src/main/java/org/springblade/modules/information/excel/InforExcel.java | 4 +-
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 5 ++
src/main/java/org/springblade/modules/system/mapper/UserDeptMapper.java | 2
src/main/java/org/springblade/modules/system/excel/UserExcel.java | 6 +-
src/main/java/org/springblade/modules/information/controller/InformationController.java | 9 ++++
src/main/java/org/springblade/modules/system/entity/User.java | 2
src/main/java/org/springblade/modules/system/service/IUserDeptService.java | 2
src/main/java/org/springblade/modules/system/service/impl/UserDeptServiceImpl.java | 4 ++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 15 +++++++
src/main/java/org/springblade/modules/information/entity/Information.java | 2 -
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml | 2
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 3 +
src/main/java/org/springblade/modules/system/controller/UserController.java | 2
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 4 ++
src/main/java/org/springblade/modules/system/mapper/UserDeptMapper.xml | 4 +
15 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index 4b19187..1220323 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -163,6 +163,15 @@
dept.setAncestors("0,1420222961377357825");
dept.setDeptCategory(1);
}
+ //跨区域保安公司
+ if (information.getStats().equals("4")) {
+ Long i = 1425366663452196865L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1425366663452196865");
+ dept.setDeptCategory(1);
+ }
if (iDeptService.submit(dept)) {
CacheUtil.clear(SYS_CACHE);
// 返回懒加载树更新节点所需字段
diff --git a/src/main/java/org/springblade/modules/information/entity/Information.java b/src/main/java/org/springblade/modules/information/entity/Information.java
index feb4f7b..c7b1442 100644
--- a/src/main/java/org/springblade/modules/information/entity/Information.java
+++ b/src/main/java/org/springblade/modules/information/entity/Information.java
@@ -66,8 +66,6 @@
*/
@ApiModelProperty(value = "成立日期")
@TableField("establishTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date establishtime;
/**
* 注册资本
diff --git a/src/main/java/org/springblade/modules/information/excel/InforExcel.java b/src/main/java/org/springblade/modules/information/excel/InforExcel.java
index 0c8571a..1d4e158 100644
--- a/src/main/java/org/springblade/modules/information/excel/InforExcel.java
+++ b/src/main/java/org/springblade/modules/information/excel/InforExcel.java
@@ -60,7 +60,7 @@
@ColumnWidth(15)
@ExcelProperty("成立日期")
- private String establishtime;
+ private Date establishtime;
@ColumnWidth(10)
@ExcelProperty("注册资本")
@@ -100,7 +100,7 @@
private String industry;
@ColumnWidth(20)
- @ExcelProperty("类型")
+ @ExcelProperty("企业类型(自招保安单位/保安培训公司/保安服务公司/武装守押公司)")
private String stats;
diff --git a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
index c7d9054..6067866 100644
--- a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
@@ -148,6 +148,10 @@
if (information.getStats().equals("武装守押公司")) {
information.setStats("3");
}
+ //跨区域保安公司
+ if (information.getStats().equals("跨区域保安公司")) {
+ information.setStats("4");
+ }
try {
arg.test01(arg.url+"/information/save",information);
} catch (Exception e) {
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 216d740..7b717bf 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -110,13 +110,14 @@
@ApiOperation(value = "新增", notes = "传入permit")
public R save(@Valid @RequestBody Permit permit) {
permit.setType("2");
+ permit.setStorage("1");
permit.setPermitime(new Date());
Map<String, String> param = null;
return R.status(permitService.save(permit));
}
/**
- * 新增
+ *暂存
*/
@PostMapping("/storage")
@ApiOperation(value = "新增", notes = "传入permit")
diff --git a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
index e2ec582..e99df64 100644
--- a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
+++ b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -36,7 +36,7 @@
</select>
<select id="selectIn" resultType="java.util.HashMap">
- select * from sys_permit where storage=0 and cardid=#{cardid}
+ select * from sys_permit where storage=0 and deptid=#{cardid}
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index 9beb9ef..0117fb4 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -34,7 +34,9 @@
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.oss.model.OssFile;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
@@ -268,6 +270,7 @@
* @return attachId
*/
private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type) throws Exception {
+ BladeUser user = AuthUtil.getUser();
String fileExtension = FileUtil.getFileExtension(fileName);
Attach attach = new Attach();
attach.setDomain(bladeFile.getDomain());
@@ -276,7 +279,7 @@
attach.setOriginalName(bladeFile.getOriginalName());
attach.setAttachSize(fileSize);
attach.setExtension(fileExtension);
- attach.setDeptid(deptid);
+ attach.setDeptid(user.getDeptId());
attach.setType(type);
attachService.save(attach);
// arg.test01(arg.url+"/blade-resource/attach/save",attach);
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 cb1db20..9633790 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -233,7 +233,7 @@
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
- UserImporter userImporter = new UserImporter(userService, isCovered == 1);
+ UserImporter userImporter = new UserImporter(userService, false);
ExcelUtil.save(file, userImporter, UserExcel.class);
return R.success("操作成功");
}
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 bce47f7..94138e8 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -157,7 +157,7 @@
private String hold;
-
+ private Integer status;
/**
* 行政区域id
*/
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 31a5970..29564b7 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -39,7 +39,7 @@
private static final long serialVersionUID = 1L;
@ColumnWidth(15)
- @ExcelProperty("账户")
+ @ExcelProperty("账号")
private String account;
@ExcelProperty("单位名称")
@@ -61,7 +61,7 @@
private String sex;
@ExcelProperty("出生日期")
- private String birthtime;
+ private Date birthday;
@ExcelProperty("身份证")
private String cardid;
@@ -95,7 +95,7 @@
@ExcelProperty("保安员证编码")
private String securitynumber;
- @ExcelProperty("在职状态")
+ @ExcelProperty("人员状态")
private String status;
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserDeptMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserDeptMapper.java
index 8f3b47d..98d46ee 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserDeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserDeptMapper.java
@@ -26,5 +26,5 @@
*/
public interface UserDeptMapper extends BaseMapper<UserDept> {
-
+ String selectIn(String deptname);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserDeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserDeptMapper.xml
index 2a67f9e..bdb1b1c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserDeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserDeptMapper.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.system.mapper.UserDeptMapper">
-
+ <select id="selectIn" resultType="java.lang.String">
+ SELECT id FROM blade_dept WHERE dept_name=#{deptname}
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserDeptService.java b/src/main/java/org/springblade/modules/system/service/IUserDeptService.java
index c6b07e7..1a4bbc9 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserDeptService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserDeptService.java
@@ -26,5 +26,5 @@
* @author Chill
*/
public interface IUserDeptService extends IService<UserDept> {
-
+ String selectIn(String deptname);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserDeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserDeptServiceImpl.java
index 52838b1..7e8e150 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserDeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserDeptServiceImpl.java
@@ -31,4 +31,8 @@
@Service
public class UserDeptServiceImpl extends ServiceImpl<UserDeptMapper, UserDept> implements IUserDeptService {
+ @Override
+ public String selectIn(String deptname) {
+ return baseMapper.selectIn(deptname);
+ }
}
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 c08be41..808e324 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
@@ -302,7 +302,22 @@
if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
user.setTenantId(AuthUtil.getTenantId());
}
+ if (userExcel.getStatus().equals("在职")){
+ user.setStatus(1);
+ }
+ else {
+ user.setStatus(2);
+ }
+ if (userExcel.getSex().equals("男性")){
+ user.setSex(1);
+ }
+ else {
+ user.setSex(2);
+ }
user.setRoleId("1412226235153731586");
+ String deptname = user.getDeptId();
+ String id =userDeptService.selectIn(deptname);
+ user.setDeptId(id);
//获取默认密码配置
String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
user.setPassword(initPassword);
--
Gitblit v1.9.3