组织画像-查获模块

airport-admin/src/main/java/com/sundot/airport/web/controller/portrait/ItemUserRankingController.java

@@ -3,9 +3,11 @@ package com.sundot.airport.web.controller.portrait;
 import cn.hutool.core.collection.CollectionUtil;
 import com.sundot.airport.common.core.domain.AjaxResult;
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.domain.portrait.ApprovalDurationStats;
 import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
+import com.sundot.airport.common.enums.DeptTypeEnum;
 import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.common.enums.portrait.UserType;
 import com.sundot.airport.common.utils.DateUtils;
@@ -15,6 +17,7 @@ import com.sundot.airport.item.domain.ItemLargeScreenDailyTrendDto;
 import com.sundot.airport.item.domain.ItemLargeScreenTimeSpanDto;
 import com.sundot.airport.item.service.UserRankingService;
 import com.sundot.airport.system.domain.approval.ApprovalInstance;
+import com.sundot.airport.system.mapper.SysDeptMapper;
 import com.sundot.airport.system.mapper.approval.ApprovalHistoryMapper;
 import com.sundot.airport.system.mapper.approval.ApprovalInstanceMapper;
 import com.sundot.airport.system.mapper.SysUserMapper;
@@ -49,11 +52,14 @@ public class ItemUserRankingController {
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
     /**
      * 获取用户在指定层级的详细排名信息
      *
      * @param dto   查询参数
-     * @param level 层级类型：station(全站), department(科室), team(班组)
+     * @param level 层级类型：station(全站), brigade(大队), department(科室), team(班组)
      * @return 用户在该层级的详细排名信息
      */
     @Cacheable(
@@ -115,7 +121,7 @@ public class ItemUserRankingController {
 
         // 查询workflow_id为4或5的审批实例（查获审批流程）
         List<ApprovalInstance> instances = approvalInstanceMapper.selectApprovalInstancesByWorkflowIdsAndTimeRangeAndUsers(
-                Arrays.asList(4L, 5L),
+                Arrays.asList(7L),
                 startTime,
                 endTime,
                 userIds);
@@ -232,9 +238,18 @@ public class ItemUserRankingController {
             queryDto.setStartDate(startTime);
             queryDto.setEndDate(endTime);
 
-            // 如果传了科室ID，则设置到查询参数中
+            // 如果传了部门ID，则设置到查询参数中
             if (params.getDeptId() != null) {
-                queryDto.setInspectDepartmentId(params.getDeptId());
+                SysDept sysDept = sysDeptMapper.selectDeptById(params.getDeptId());
+                if (sysDept != null) {
+                    if (DeptTypeEnum.BRIGADE.getCode().equals(sysDept.getDeptType())) {
+                        queryDto.setInspectBrigadeId(params.getDeptId());
+                    } else if (DeptTypeEnum.MANAGER.getCode().equals(sysDept.getDeptType())) {
+                        queryDto.setInspectDepartmentId(params.getDeptId());
+                    } else if (DeptTypeEnum.TEAMS.getCode().equals(sysDept.getDeptType())) {
+                        queryDto.setInspectTeamId(params.getDeptId());
+                    }
+                }
             }
 
             // 调用service获取按天统计的查获趋势数据,没有的补0

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -195,7 +195,7 @@ public class SysUserController extends BaseController {
         if (Objects.nonNull(dto.getDeptId())) {
             SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
             if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.TEAMS.getCode(), sysDept.getDeptType())) {
-                indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) ? UserType.STATION : StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) ? UserType.BRIGADE : StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType()) ? UserType.DEPARTMENT : UserType.TEAM);
+                indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) ? UserType.STATION : StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) ? UserType.BRIGADE : StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType()) ? UserType.DEPARTMENT : UserType.TEAM);
                 List<SysUser> sysUsers = iSysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()), dto.getDeptId());
                 indicatorCalculateParams.setUserIds(sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList()));
                 indicatorCalculateParams.setDeptId(dto.getDeptId());

airport-item/src/main/java/com/sundot/airport/item/service/impl/UserRankingServiceImpl.java

@@ -81,8 +81,25 @@ public class UserRankingServiceImpl implements UserRankingService {
         List<SysDept> collect = new ArrayList<>();
         switch (level) {
             case "station":
-                if (dept.getDeptType().equals(DeptTypeEnum.DEPARTMENT.getCode())) {
-                    collect = allDepts.stream().filter(de -> de.getDeptType().equals(DeptTypeEnum.DEPARTMENT.getCode())).collect(Collectors.toList());
+                if (dept.getDeptType().equals(DeptTypeEnum.BRIGADE.getCode())) {
+                    collect = allDepts.stream().filter(de -> de.getDeptType().equals(DeptTypeEnum.BRIGADE.getCode())).collect(Collectors.toList());
+                    //查所有的大队
+                    rankings = itemLargeScreenMapper.rankByBrigade(dto);
+                } else if (dept.getDeptType().equals(DeptTypeEnum.MANAGER.getCode())) {
+                    collect = allDepts.stream().filter(de -> de.getDeptType().equals(DeptTypeEnum.MANAGER.getCode())).collect(Collectors.toList());
+                    //查所有的科
+                    rankings = itemLargeScreenMapper.rankByDepartment(dto);
+                } else if (dept.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())) {
+                    //查所有的班
+                    collect = allDepts.stream().filter(de -> de.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())).collect(Collectors.toList());
+                    rankings = itemLargeScreenMapper.rankByTeam(dto);
+                } else {
+                    return null;
+                }
+                break;
+            case "brigade":
+                if (dept.getDeptType().equals(DeptTypeEnum.MANAGER.getCode())) {
+                    collect = allDepts.stream().filter(de -> de.getDeptType().equals(DeptTypeEnum.MANAGER.getCode())).collect(Collectors.toList());
                     //查所有的科
                     rankings = itemLargeScreenMapper.rankByDepartment(dto);
                 } else if (dept.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())) {
@@ -215,11 +232,25 @@ public class UserRankingServiceImpl implements UserRankingService {
                 return null;
             }
         }
+        Long brigadeId = findBrigadeIdByUser(user);
+        List<SysUser> brigadeIdUsers = new ArrayList<>();
+        if (brigadeId != null) {
+            stationUsers = sysUserService.selectUserListByRoleKeyAndDeptId(
+                    Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()),
+                    brigadeId);
+            if (CollectionUtil.isEmpty(stationUsers)) {
+                return null;
+            }
+        }
         switch (level) {
             case "station":
                 // 查询站下所有用户
                 users.addAll(stationUsers);
                 return itemLargeScreenMapper.rankByIndividual(dto);
+            case "brigade":
+                // 查询大队下所有用户
+                users.addAll(brigadeIdUsers);
+                return itemLargeScreenMapper.rankByIndividual(dto);
             case "department":
                 if (RoleTypeEnum.banzuzhang.getCode().equals(sysRole.getRoleKey()) ||
                         RoleTypeEnum.SecurityCheck.getCode().equals(sysRole.getRoleKey())) {
@@ -268,6 +299,33 @@ public class UserRankingServiceImpl implements UserRankingService {
         return currentDept != null ? currentDept.getDeptId() : null;
     }
 
+    /**
+     * 根据用户查找其所属的大队ID
+     *
+     * @param user 用户
+     * @return 站点ID
+     */
+    private Long findBrigadeIdByUser(SysUser user) {
+        // 获取用户所在部门
+        SysDept userDept = user.getDept();
+        if (userDept == null) {
+            return null;
+        }
+
+        // 如果用户所在部门就是大队
+        if (DeptTypeEnum.BRIGADE.getCode().equals(userDept.getDeptType())) {
+            return userDept.getDeptId();
+        }
+
+        // 向上查找父级部门，直到找到大队
+        SysDept currentDept = userDept;
+        while (currentDept != null && !DeptTypeEnum.BRIGADE.getCode().equals(currentDept.getDeptType())) {
+            currentDept = sysDeptService.selectDeptById(currentDept.getParentId());
+        }
+
+        return currentDept != null ? currentDept.getDeptId() : null;
+    }
+
     // 构建默认排名对象
     private ItemLargeScreenCommonDto buildDefaultRanking(SysUser user) {
         ItemLargeScreenCommonDto dto = new ItemLargeScreenCommonDto();
@@ -306,8 +364,8 @@ public class UserRankingServiceImpl implements UserRankingService {
         // 直接查询部门信息
         SysDept queryDept = new SysDept();
         queryDept.setDeptId(params.getDeptId());
-        queryDept.setDeptType(DeptTypeEnum.DEPARTMENT.getCode());
-        //查询站和科室的信息
+        queryDept.setDeptType(DeptTypeEnum.BRIGADE.getCode());
+        //查询站和大队的信息
         List<SysDept> sysDeptList = sysDeptService.selectDeptInfo(queryDept);
         if (CollectionUtil.isEmpty(sysDeptList)) {
             return result;
@@ -318,7 +376,7 @@ public class UserRankingServiceImpl implements UserRankingService {
         sysDeptList.forEach(sysDept -> {
             BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
             if (!sysDept.getDeptId().equals(params.getDeptId())) {
-                dto.setInspectDepartmentId(sysDept.getDeptId());
+                dto.setInspectBrigadeId(sysDept.getDeptId());
             }
             dto.setStartDate(startTime);
             dto.setEndDate(endTime);