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 | 87 ++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 58 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 553ae83..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
@@ -44,7 +44,6 @@
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.system.entity.*;
-import org.springblade.modules.system.excel.ExportSecurityPaperExcel;
import org.springblade.modules.system.excel.QrCodeExcel;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.mapper.UserMapper;
@@ -52,10 +51,6 @@
import org.springblade.modules.system.service.*;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -63,8 +58,6 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -478,11 +471,17 @@
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);
}
@@ -634,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) -> {
@@ -892,55 +913,5 @@
}
- /**
- * 导出保安员证信息
- * @param user
- * @return
- */
- @Override
- public List<ExportSecurityPaperExcel> exportSecurityPaperList(UserVO user) {
- //查询数据
- List<UserVO> userVOList = baseMapper.exportSecurityPaperList(user);
- if (userVOList.size()>0) {
- //返回的集合数据
- List<ExportSecurityPaperExcel> list = new ArrayList<>();
- //遍历
- userVOList.forEach(userVO -> {
- ExportSecurityPaperExcel excel = new ExportSecurityPaperExcel();
- //数据转换封装
- excel.setRealName(userVO.getRealName());
- excel.setIdCardNo(userVO.getCardid());
- excel.setDeptName(userVO.getDeptName());
- //如果头像有
- if (null != userVO.getAvatar() && userVO.getAvatar() != "") {
- try {
- if (userVO.getAvatar().contains("http:")) {
- excel.setAvatar(new URL(userVO.getAvatar()));
- }
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
- }
- //如果保安证编号不为空
- if (null != userVO.getSecuritynumber() && userVO.getSecuritynumber() != "") {
- //去生成二维码
- String url = "http://223.82.109.183:2080/securityInfo.html";
- String encoded = null;
- try {
- encoded = URLEncoder.encode(userVO.getSecuritynumber(), "UTF-8");
- String content = url + "?securityNumber=" + encoded;
- URLEncoder.encode(content, "utf-8");
- byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
- //设置二维码
- excel.setQrCode(qrCodeImage);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- list.add(excel);
- });
- return list;
- }
- return null;
- }
+
}
--
Gitblit v1.9.3