From 188ed7f38446d6f87a4a444e0f07afbcceb41f73 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 30 Aug 2021 18:09:15 +0800
Subject: [PATCH] 派遣人员查询接口修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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..03ded9b 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;
@@ -56,6 +59,7 @@
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import sun.plugin.com.DispatchClient;
import java.util.*;
@@ -633,7 +637,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 +650,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