From 99240e80f8cc18c1944bc9f5c7e48c47c751cd45 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 14:46:25 +0800
Subject: [PATCH] 培训报名考试申请后导入报名数据修改，保安公司查询接口修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 36 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 8dfd6eb..9f8e67a 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
@@ -26,6 +26,7 @@
import org.springblade.common.cache.ParamCache;
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;
@@ -139,7 +140,15 @@
@Override
public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
- return page.setRecords(baseMapper.selectUserPages(page, user));
+ List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
+ userVOS.forEach(userVO -> {
+ if (null!=userVO.getCardid() && userVO.getCardid()!=""){
+ userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
+ }else {
+ userVO.setAge(null);
+ }
+ });
+ return page.setRecords(userVOS);
}
@Override
@@ -305,19 +314,8 @@
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
// 设置租户ID
user.setTenantId("000000");
- if (null != userExcel.getStatus() && userExcel.getStatus() != "") {
- if (userExcel.getStatus().equals("在职")) {
- user.setStatus(1);
- } else {
- user.setStatus(2);
- }
- }
- if (userExcel.getSex().equals("男性")) {
- user.setSex(1);
- }
- if (userExcel.getSex().equals("女性")){
- user.setSex(2);
- }
+ //默认在职
+ user.setStatus(1);
//判断是否持证
if (null != userExcel.getHold() && userExcel.getHold() != "") {
if (userExcel.getHold().equals("是")) {
@@ -336,12 +334,22 @@
user.setRoleId(oneRole.getId().toString());
}
}
- String deptname = user.getDeptId();
- String id = userDeptService.selectIn(deptname);
- user.setDeptId(id);
+ if (null!=userExcel.getSex()) {
+ if (userExcel.getSex().equals("男")) {
+ user.setSex(1);
+ }
+ if (userExcel.getSex().equals("女")) {
+ user.setSex(2);
+ }
+ }
+ //设置部门id
+ user.setDeptId(userDeptService.selectIn(user.getDeptId()));
+ //设置账号
+ user.setAccount(user.getCardid());
//获取默认密码配置
- String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
- user.setPassword(initPassword);
+ user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
+// user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
+ //新增
this.submit(user);
});
}
@@ -551,13 +559,8 @@
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
// 设置租户ID
user.setTenantId("000000");
- if (null != userExcel.getStatus() && userExcel.getStatus() != "") {
- if (userExcel.getStatus().equals("在职")) {
- user.setStatus(1);
- } else {
- user.setStatus(2);
- }
- }
+ //默认在职
+ user.setStatus(1);
//判断是否持证
if (null != userExcel.getHold() && userExcel.getHold() != "") {
if (userExcel.getHold().equals("是")) {
@@ -576,19 +579,50 @@
user.setRoleId(oneRole.getId().toString());
}
}
- if (userExcel.getSex().equals("男性")) {
- user.setSex(1);
- } else {
- user.setSex(2);
+ if (null!=userExcel.getSex()) {
+ if (userExcel.getSex().equals("男")) {
+ user.setSex(1);
+ }
+ if (userExcel.getSex().equals("女")) {
+ user.setSex(2);
+ }
}
-
- String deptname = user.getDeptId();
- String id = userDeptService.selectIn(deptname);
- user.setDeptId(id);
+ //设置部门id
+ user.setDeptId(userDeptService.selectIn(user.getDeptId()));
+ //设置账号
+ user.setAccount(user.getCardid());
//获取默认密码配置
- String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
- user.setPassword(initPassword);
+ user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
+// user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
+ //新增
this.submit(user);
});
}
+
+
+ /**
+ * 根据保安员编码查询保安信息
+ * @param securityNumber 保安证编码
+ * @return
+ */
+ @Override
+ public UserVO getUserInfoBySecurityNumber(String securityNumber) {
+ return baseMapper.getUserInfoBySecurityNumber(securityNumber);
+ }
+
+
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ @Override
+ public UserVO getUserDetails(User user) {
+ return baseMapper.getUserDetails(user);
+ }
+
+ @Override
+ public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction) {
+ return baseMapper.seleL(type,deptid, jurisdiction);
+ }
}
--
Gitblit v1.9.3