From 92d375e11f68b898cd8a46cf02bcb82cd469ded5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 02 Sep 2021 11:58:02 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 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 e258e59..9cfd56d 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
@@ -41,6 +41,9 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
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;
@@ -324,20 +327,17 @@
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("否")) {
user.setHold("2");
- Role role = new Role();
- role.setRoleAlias("未持证保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
}
}
+ //分配保安角色
+ 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);
@@ -569,20 +569,17 @@
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("否")) {
user.setHold("2");
- Role role = new Role();
- role.setRoleAlias("未持证保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
}
}
+ //分配保安角色
+ 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);
@@ -633,7 +630,7 @@
* @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 (Integer.parseInt(type)==1){
@@ -646,10 +643,31 @@
}
//保安向民警
if (Integer.parseInt(type)==3){
- Information information = new Information();
- information.setDepartmentid(deptid);
- Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
- list = baseMapper.getWorkReportInfo(type,null, one.getJurisdiction());
+ //查询用户信息
+ 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){
--
Gitblit v1.9.3