From ddebcfaf85cbb400668f38b1efd82e439c6e1012 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:39:43 +0800
Subject: [PATCH] 报名考试接口修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 72 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 4 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 9832ab0..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
@@ -43,6 +43,7 @@
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.mapper.UserMapper;
+import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserDeptService;
import org.springblade.modules.system.service.IUserOauthService;
@@ -52,10 +53,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
@@ -304,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);
@@ -429,4 +442,55 @@
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId);
}
+
+
+ /**
+ * 保安员列表，帅选无保安证
+ * @param page
+ * @param user
+ * @param deptId
+ * @param tenantId
+ * @return
+ */
+ @Override
+ public IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ return baseMapper.selectUserPageSecurityApply(page, user, null, tenantId);
+ }
+
+ /**
+ * 保安员列表树 安员列表树，帅选无保安证,下拉tree
+ * @param user 用户信息
+ * @return
+ */
+ @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;
+ }
+
+ @Override
+ public List<Map<Object, Object>> selectInr(String deptid) {
+ return baseMapper.selectInr(deptid);
+ }
+
+ /**
+ * 查询当前年份已有的保安证编号
+ * @param pre 前缀
+ * @return
+ */
+ @Override
+ public int getSecurityPaperCount(String pre) {
+ return baseMapper.getSecurityPaperCount(pre);
+ }
}
--
Gitblit v1.9.3