From a445f592f22bc3f1bb7fe18ef80352c9f49f408c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 08 Nov 2021 13:50:12 +0800
Subject: [PATCH] 派遣人员查询接口新增修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 74 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 15 deletions(-)
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 3a5192f..bb50959 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
@@ -17,20 +17,16 @@
package org.springblade.modules.system.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
-import org.springblade.common.cache.DictCache;
-import org.springblade.common.cache.ParamCache;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
-import org.springblade.common.cache.UserCache;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
-import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
@@ -44,12 +40,9 @@
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.auth.enums.UserEnum;
-import org.springblade.modules.dispatcher.service.IDispatcherService;
-import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
-import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.QrCodeExcel;
import org.springblade.modules.system.excel.UserExcel;
@@ -68,8 +61,7 @@
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
-
-import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* 服务实现类
@@ -388,8 +380,16 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
+// @Transactional(rollbackFor = Exception.class) 去除事务回滚
public void importUser(List<UserExcel> data, Boolean isCovered,String deptId) {
+ //将不能导入的保安员账号存起来
+ List<String> errorList = new ArrayList<>();
+ //将需要新增的保安员信息存入集合
+ List<User> insertList = new ArrayList<>();
+ //将需要更新的保安员信息存入集合
+ List<User> updateList = new ArrayList<>();
+ //导入状态，默认为true ,如果有一个出现问题则为 false
+ AtomicBoolean status = new AtomicBoolean(true);
data.forEach(userExcel -> {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
//设置部门id
@@ -397,18 +397,17 @@
if (null!=deptIds && !deptIds.equals("")) {
if (null != deptId && !deptId.equals("")) {
if (!deptId.equals(deptIds)) {
- throw new ServiceException("不能导入不是本公司的保安员数据!");
+ throw new ServiceException("导入失败!不能导入不是本公司的保安员数据!");
}
}
user.setDeptId(deptIds);
}else {
//如果deptIds 为空，则说明还没有改公司
- throw new ServiceException("公司名:"+user.getDeptId()+"不存在!");
+ throw new ServiceException("导入失败!公司名:["+user.getDeptId()+"]不存在!");
}
//判断当前用户是否已在本单位，如果是的更新数据
User user1 = new User();
user1.setAccount(user.getCardid());
- System.out.println("user.getCardid() = " + user.getCardid());
user1.setIsDeleted(0);
user1.setStatus(1);
User user2 = this.getOne(Condition.getQueryWrapper(user1));
@@ -453,7 +452,12 @@
//匹配组织机构是否一致,如果不一致
if(!user2.getDeptId().equals(user.getDeptId())){
Dept dept = deptService.getById(user2.getDeptId());
- throw new ServiceException("用户:"+"["+user.getCardid()+"]"+"已在["+dept.getDeptName()+"]存在!");
+// throw new ServiceException("用户:"+"["+user.getCardid()+"]"+"已在其他单位存在!");
+ status.set(false);
+ //加入集合
+ errorList.add(user.getCardid());
+ //forEach 只能使用 return 跳出本次循环
+ return;
}else {
//如果是一致，则更新用户数据
//判断是否持证
@@ -467,16 +471,27 @@
user2.setHold("2");
}
}
+ if (null!=userExcel.getRegistered()){
+ user2.setRegistered(userExcel.getRegistered());
+ }else {
+ user2.setRegistered("");
+ }
//更新用户数据
this.updateById(user2);
String s1 =
"update blade_user set hold = " + "'" + user2.getHold() + "'"
+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
+ + ",registered = " + "'" + user2.getRegistered() + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
}
});
+ //如果所有数据导入有一个异常
+ if (!status.get()){
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ throw new ServiceException("用户:["+errorAccount+"]导入失败!已在其他单位存在!");
+ }
}
// @Override
@@ -618,6 +633,28 @@
@Override
public List<TreeNode> getSecurityApplyTree(UserVO user) {
Map<Long, TreeNode> map = baseMapper.getSecurityApplyTree(user);
+ List<TreeNode> tree = new ArrayList<>();
+ if (map.size() > 1) {
+ map.forEach((id, treeNode) -> {
+ if (map.containsKey(treeNode.getParentId())) {
+ map.get(treeNode.getParentId()).getChildren().add(treeNode);
+ } else {
+ tree.add(treeNode);
+ }
+ });
+ }
+ return tree;
+ }
+
+ /**
+ * 派遣保安员列表树 安员列表树，帅选无保安证,下拉tree
+ *
+ * @param user 用户信息
+ * @return
+ */
+ @Override
+ public List<TreeNode> getSecurityDispatcherTree(UserVO user) {
+ Map<Long, TreeNode> map = baseMapper.getSecurityDispatcherTree(user);
List<TreeNode> tree = new ArrayList<>();
if (map.size() > 1) {
map.forEach((id, treeNode) -> {
@@ -799,6 +836,10 @@
if (Integer.parseInt(type) == 4) {
list = baseMapper.getWorkReportInfo(type, deptid, jurisdiction);
}
+ //现场检查获取保安员
+ if (Integer.parseInt(type) == 5) {
+ list = baseMapper.getSecurityInfo(jurisdiction);
+ }
return list;
}
@@ -870,4 +911,7 @@
}
});
}
+
+
+
}
--
Gitblit v1.9.3