From 2ebca060a47784db76369a4aa84f63293da9be33 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 10:08:08 +0800
Subject: [PATCH] 保安员新增同步编号问题
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 insertions(+), 2 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 3a53997..57cf305 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
@@ -48,6 +48,7 @@
import org.springblade.modules.system.service.IUserDeptService;
import org.springblade.modules.system.service.IUserOauthService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserDTO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
@@ -138,7 +139,7 @@
}
@Override
- public IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
+ 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));
}
@@ -431,7 +432,30 @@
*/
@Override
public IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user) {
- return page.setRecords(baseMapper.selectUserPageSecurity(page, user));
+ List<UserVO> userVOS = baseMapper.selectUserPageSecurity(page, user);
+ //机构名称拼接
+ userVOS.forEach(userVO -> {
+ if (null!=userVO.getDeptId()) {
+ List<String> list = baseMapper.getDeptName(userVO.getDeptId());
+ if (list.size() > 1) {
+ if (null != list.get(1) && list.get(1) != "") {
+ String s = list.get(1).toString();
+ if (s.equals("本市保安公司") || s.equals("保安培训学校") || s.equals("自招保安单位") || s.equals("武装押运公司") || s.equals("分公司") || s.equals("其他")){
+ userVO.setDeptName(list.get(0));
+ }
+ else {
+ userVO.setDeptName(list.get(1) + "," + list.get(0));
+ }
+ } else {
+ userVO.setDeptName(list.get(0));
+ }
+ }
+ if (list.size() == 1) {
+ userVO.setDeptName(list.get(0));
+ }
+ }
+ });
+ return page.setRecords(userVOS);
}
/**
@@ -488,5 +512,54 @@
return baseMapper.selectPeo(user);
}
+ /**
+ * 查询用户年龄
+ * @param id
+ * @return
+ */
+ @Override
+ public int getUserAge(long id) {
+ return baseMapper.getUserAge(id);
+ }
+ /**
+ * 查询保安证编号位数
+ * @param pre
+ * @return
+ */
+ @Override
+ public Integer getSecurityPaperCount(String pre) {
+ return baseMapper.getSecurityPaperCount(pre);
+ }
+
+ /**
+ * 查询保安员信息
+ * @param user
+ * @return
+ */
+ @Override
+ public UserDTO getSecurityInfoByIdCardNo(User user) {
+ return baseMapper.getSecurityInfoByIdCardNo(user);
+ }
+
+ /**
+ * 根据身份证号查询用户
+ * @param candidateNo
+ * @return
+ */
+ @Override
+ public User getUserInfoByIdCardNo(String candidateNo) {
+ return baseMapper.getUserInfoByIdCardNo(candidateNo);
+ }
+
+ /**
+ * 计算保安人员年龄
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public UserVO getUserAgeById(long id) {
+ return baseMapper.getUserAgeById(id);
+ }
}
--
Gitblit v1.9.3