From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 75 insertions(+), 24 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 99ac878..119c10c 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
@@ -95,10 +95,10 @@
if (Func.isNotEmpty(user.getPassword())) {
user.setPassword(DigestUtil.encrypt(user.getPassword()));
}
- Integer userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount()));
- if (userCount > 0 && Func.isEmpty(user.getId())) {
- throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
- }
+// Integer userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount()));
+// if (userCount > 0 && Func.isEmpty(user.getId())) {
+// throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+// }
return save(user) && submitUserDept(user);
}
@@ -138,7 +138,12 @@
}
@Override
- public IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
+ return page.setRecords(baseMapper.selectUserPages(page, user));
+ }
+
+ @Override
+ public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
}
@@ -302,7 +307,22 @@
if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
user.setTenantId(AuthUtil.getTenantId());
}
+ if (null != userExcel.getStatus() && userExcel.getStatus() != "") {
+ 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);
@@ -405,6 +425,7 @@
/**
* 通过 身份证号查询用户信息
+ *
* @param idCardNo 身份证号
* @return
*/
@@ -414,51 +435,50 @@
}
@Override
- public IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String tenantId) {
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId));
+ public IPage<User> selectUserPageSecurity(IPage<User> page, User user) {
+ return page.setRecords(baseMapper.selectUserPageSecurity(page, user));
}
/**
* 自定义用户列表(只有保安员),根据保安员查
*/
@Override
- public List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String tenantId) {
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId);
+ public List<User> selectUserPageSecurityUnit(IPage<User> page, User user) {
+ return baseMapper.selectUserPageSecurity(page, user);
}
/**
* 保安员列表，帅选无保安证
+ *
* @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);
+ public IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user) {
+ return baseMapper.selectUserPageSecurityApply(page, user);
}
/**
* 保安员列表树 安员列表树，帅选无保安证,下拉tree
+ *
* @param user 用户信息
* @return
*/
@Override
public List<TreeNode> getSecurityApplyTree(UserVO user) {
- Map<Long,TreeNode> map = baseMapper.getSecurityApplyTree(user);
+ Map<Long, TreeNode> map = baseMapper.getSecurityApplyTree(user);
List<TreeNode> tree = new ArrayList<>();
- map.forEach((id,treeNode) ->{
- if (map.containsKey(treeNode.getParentId())){
- map.get(treeNode.getParentId()).getChildren().add(treeNode);
- }else {
- tree.add(treeNode);
- }
- });
+ 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;
}
@@ -466,4 +486,35 @@
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);
+ }
+
+ /**
+ * 查询当前公司未持证保安没有报名的人员
+ * @param deptId
+ * @return
+ */
+ @Override
+ public List<User> getNotApplyIdList(String deptId) {
+ return baseMapper.getNotApplyIdList(deptId);
+ }
+
+ /**
+ * 计算保安人员年龄
+ * @param userId
+ * @return
+ */
+ @Override
+ public UserVO getUserAgeById(Long userId) {
+ return baseMapper.getUserAgeById(userId);
+ }
}
--
Gitblit v1.9.3