From 35a6e9cedc2f44bebc9e4ec81a429eddc8b631ea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Sep 2021 11:41:42 +0800
Subject: [PATCH] 用户查询接口修改，部门名称需拼接父部门名称
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 175 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 140 insertions(+), 35 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 7f854b8..c1fa1d7 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
@@ -40,7 +40,14 @@
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.auth.enums.UserEnum;
+import org.springblade.modules.dispatcher.service.IDispatcherService;
+import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
+import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.information.service.IInformationService;
+import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.mapper.UserMapper;
@@ -72,6 +79,7 @@
private final IUserOauthService userOauthService;
private final IRoleService roleService;
private final BladeTenantProperties tenantProperties;
+ private final IInformationService iInformationService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -100,7 +108,27 @@
// if (userCount > 0 && Func.isEmpty(user.getId())) {
// throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
// }
- return save(user) && submitUserDept(user);
+ boolean b = save(user) && submitUserDept(user);
+ String s = "insert into blade_user(id,tenant_id,account,password,real_name,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation," +
+ "politicaloutlook,healstats,height,address,registered,securitynumber,hold,status,dispatch) " +
+ "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
+ "'" + user.getPassword() + "'" + "," + "'" + user.getRealName() + "'" + "," +
+ "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
+ "," + "'" + user.getDeptId() + "'" +
+ "," + "'" + user.getCardid() + "'" +
+ "," + "'" + user.getNativeplace() + "'" +
+ "," + "'" + user.getNation() + "'" +
+ "," + "'" + user.getPoliticaloutlook() + "'" +
+ "," + "'" + user.getHealstats() + "'"
+ + "," + "'" + user.getHeight() + "'" +
+ "," + "'" + user.getAddress() + "'" +
+ "," + "'" + user.getRegistered() + "'" + "," +
+ "'" + user.getSecuritynumber() + "'" +
+ "," + "'" + user.getHold() + "'" +
+ "," + "'" + user.getStatus() + "'" +
+ "," + "'" + user.getDispatch() + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
+ return b;
}
@Override
@@ -142,9 +170,9 @@
public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
userVOS.forEach(userVO -> {
- if (null!=userVO.getCardid() && userVO.getCardid()!=""){
+ if (null != userVO.getCardid() && userVO.getCardid() != "") {
userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
- }else {
+ } else {
userVO.setAge(null);
}
});
@@ -152,9 +180,36 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
+ List<UserVO> users = baseMapper.selectUserPage(page, user, deptIdList, tenantId);
+ //遍历获取部门名称，角色名称
+ users.forEach(userVO -> {
+ //查询当前部门名称及父级部门名称
+ List<String> list = baseMapper.getDeptName(userVO.getDeptId());
+ if (list.size()>1){
+ if (null!=list.get(1) && list.get(1)!=""){
+ userVO.setDeptName(list.get(1)+","+list.get(0));
+ }else {
+ userVO.setDeptName(list.get(0));
+ }
+ }
+ if (list.size()==1){
+ userVO.setDeptName(list.get(0));
+ }
+ //查询角色名称
+ List<String> asList = Arrays.asList(userVO.getRoleId().split(","));
+ StringBuilder builder = new StringBuilder();
+ asList.forEach(roleIs ->{
+ Role role = roleService.getById(roleIs);
+ if (null!=role){
+ builder.append(role.getRoleName()+",");
+ }
+ });
+ String substringRoleName = builder.toString().substring(0, builder.toString().length() - 1);
+ userVO.setRoleName(substringRoleName);
+ });
+ return page.setRecords(users);
}
@Override
@@ -320,21 +375,18 @@
if (null != userExcel.getHold() && userExcel.getHold() != "") {
if (userExcel.getHold().equals("是")) {
user.setHold("1");
- //分配保安角色
- Role role = new Role();
- role.setRoleAlias("保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
}
- if(userExcel.getHold().equals("否")) {
+ if (userExcel.getHold().equals("否")) {
user.setHold("2");
- Role role = new Role();
- role.setRoleAlias("未持证保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
}
}
- if (null!=userExcel.getSex()) {
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ //性别
+ if (null != userExcel.getSex()) {
if (userExcel.getSex().equals("男")) {
user.setSex(1);
}
@@ -347,7 +399,7 @@
//设置账号
user.setAccount(user.getCardid());
//获取默认密码配置
- user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
+ user.setPassword(user.getCardid().substring(user.getCardid().length() - 6));
// user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
//新增
this.submit(user);
@@ -524,6 +576,7 @@
/**
* 查询当前公司未持证保安没有报名的人员
+ *
* @param deptId
* @return
*/
@@ -534,6 +587,7 @@
/**
* 计算保安人员年龄
+ *
* @param userId
* @return
*/
@@ -549,6 +603,7 @@
/**
* 导入保安员
+ *
* @param data
* @param isCovered
*/
@@ -561,25 +616,23 @@
user.setTenantId("000000");
//默认在职
user.setStatus(1);
+ user.setDispatch("1");
//判断是否持证
if (null != userExcel.getHold() && userExcel.getHold() != "") {
if (userExcel.getHold().equals("是")) {
user.setHold("1");
- //分配保安角色
- Role role = new Role();
- role.setRoleAlias("保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
}
- if(userExcel.getHold().equals("否")) {
+ if (userExcel.getHold().equals("否")) {
user.setHold("2");
- Role role = new Role();
- role.setRoleAlias("未持证保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
}
}
- if (null!=userExcel.getSex()) {
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+
+ if (null != userExcel.getSex()) {
if (userExcel.getSex().equals("男")) {
user.setSex(1);
}
@@ -592,7 +645,7 @@
//设置账号
user.setAccount(user.getCardid());
//获取默认密码配置
- user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
+ user.setPassword(user.getCardid().substring(user.getCardid().length() - 6));
// user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
//新增
this.submit(user);
@@ -602,6 +655,7 @@
/**
* 根据保安员编码查询保安信息
+ *
* @param securityNumber 保安证编码
* @return
*/
@@ -613,6 +667,7 @@
/**
* 保安员信息
+ *
* @param user
* @return
*/
@@ -621,17 +676,67 @@
return baseMapper.getUserDetails(user);
}
+ /**
+ * @param type 1:派遣 2：保安向
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
@Override
- public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction) {
+ public List<Map<String, Object>> seleL(String type, String deptid, String jurisdiction, Long userId) {
List<Map<String, Object>> list = new ArrayList<>();
- //工作汇报
- if (type.equals(1)){
+ //派遣
+ if (Integer.parseInt(type) == 1) {
list = baseMapper.getDispaterInfo(deptid, jurisdiction);
}
- //派遣
- if (type.equals(2) ||type.equals(3)){
- list = baseMapper.getWorkReportInfo(type,deptid, jurisdiction);
+ //工作汇报
+ //保安向保安
+ if (Integer.parseInt(type) == 2) {
+ list = baseMapper.getWorkReportInfo(type, deptid, jurisdiction);
+ }
+ //保安向民警
+ if (Integer.parseInt(type) == 3) {
+ //查询用户信息
+ User user = this.getById(userId);
+ //判断用户是否被派遣
+ if (null != user.getDispatch()) {
+ if (user.getDispatch().equals("0")) {
+ //在派遣中，向派遣所在地辖区民警汇报
+ //查询派遣信息
+ DispatcherVO dispatcherVO = baseMapper.getDispatcherInfoByUserId(userId);
+ list = baseMapper.getWorkReportInfos(null, null, dispatcherVO.getJurisdiction());
+ }
+ if (user.getDispatch().equals("1")) {
+ //未派遣或已派遣结束，向单位所在辖区民警汇报
+ Information information = new Information();
+ information.setDepartmentid(user.getDeptId());
+ Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
+ list = baseMapper.getWorkReportInfos(type, null, one.getJurisdiction());
+ }
+ } else {
+ //未派遣或已派遣结束，向单位所在辖区民警汇报
+ Information information = new Information();
+ information.setDepartmentid(user.getDeptId());
+ Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
+ list = baseMapper.getWorkReportInfos(type, null, one.getJurisdiction());
+ }
+
+ }
+ //民警对民警
+ if (Integer.parseInt(type) == 4) {
+ list = baseMapper.getWorkReportInfo(type, deptid, jurisdiction);
}
return list;
}
+
+ /**
+ * 查询账号相同的用户数量
+ *
+ * @param account
+ * @return
+ */
+ @Override
+ public Integer selectCount(String account) {
+ return baseMapper.selectCountAccount(account);
+ }
}
--
Gitblit v1.9.3