组织画像-标准执行

airport-check/src/main/java/com/sundot/airport/check/domain/CheckLargeScreenCorrectionPortraitDto.java

@@ -29,6 +29,16 @@ public class CheckLargeScreenCorrectionPortraitDto {
     private Integer stationTotal;
 
     /**
+     * 本大队总排名
+     */
+    private Integer brigadeRanking;
+
+    /**
+     * 本大队总人数
+     */
+    private Integer brigadeTotal;
+
+    /**
      * 本科总排名
      */
     private Integer departmentRanking;

airport-check/src/main/java/com/sundot/airport/check/domain/CheckLargeScreenCorrectionPortraitSqlDto.java

@@ -20,6 +20,16 @@ public class CheckLargeScreenCorrectionPortraitSqlDto implements Serializable {
     private Long id;
 
     /**
+     * 被检查大队ID
+     */
+    private Long checkedBrigadeId;
+
+    /**
+     * 被检查大队名称
+     */
+    private String checkedBrigadeName;
+
+    /**
      * 被检查科室ID
      */
     private Long checkedDepartmentId;

airport-check/src/main/java/com/sundot/airport/check/service/impl/CheckLargeScreenServiceImpl.java

@@ -948,12 +948,32 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 }
             });
         }
+        //补充被检查班科室数据
+        List<Long> checkedTeamIdListTemp = all.stream().filter(item -> ObjectUtil.isNull(item.getCheckedDepartmentId())).map(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedTeamId).distinct().collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(checkedTeamIdListTemp)) {
+            List<SysDept> checkedTeamListTemp = sysDeptService.selectDeptByIdList(checkedTeamIdListTemp);
+            if (CollUtil.isNotEmpty(checkedTeamListTemp)) {
+                Map<Long, Long> deptIdMap = checkedTeamListTemp.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getParentId, (oldValue, newValue) -> newValue));
+                List<Long> checkedDepartmentIdListTemp = checkedTeamListTemp.stream().map(SysDept::getParentId).collect(Collectors.toList());
+                List<SysDept> checkedDepartmentListTemp = sysDeptService.selectDeptByIdList(checkedDepartmentIdListTemp);
+                if (CollUtil.isNotEmpty(checkedDepartmentListTemp)) {
+                    Map<Long, String> deptMap = checkedDepartmentListTemp.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName, (oldValue, newValue) -> newValue));
+                    all.forEach(item -> {
+                        if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
+                            item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
+                            item.setCheckedTeamName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
+                        }
+                    });
+                }
+            }
+        }
 
         // 查询条件处理
+        Long brigadeId = dto.getCheckedBrigadeId();
         Long departmentId = dto.getCheckedDepartmentId();
         Long teamId = dto.getCheckedTeamId();
         Long userId = dto.getCheckedUserId();
-        if (ObjUtil.isNull(dto.getCheckedDepartmentId()) && ObjUtil.isNull(dto.getCheckedTeamId()) && ObjUtil.isNull(dto.getCheckedUserId())) {
+        if (ObjUtil.isNull(dto.getCheckedBrigadeId()) && ObjUtil.isNull(dto.getCheckedDepartmentId()) && ObjUtil.isNull(dto.getCheckedTeamId()) && ObjUtil.isNull(dto.getCheckedUserId())) {
             List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
             if (CollUtil.isEmpty(roles)) {
                 return null;
@@ -962,17 +982,21 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
                 dto.setIsSelfCheck(null);
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
-                dto.setIsSelfCheck(null);
+                dto.setIsSelfCheck(0);
+            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                dto.setIsSelfCheck(0);
+                brigadeId = SecurityUtils.getLoginUser().getDeptId();
+                dto.setCheckedBrigadeId(brigadeId);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(null);
+                dto.setIsSelfCheck(0);
                 departmentId = SecurityUtils.getLoginUser().getDeptId();
                 dto.setCheckedDepartmentId(departmentId);
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(null);
+                dto.setIsSelfCheck(0);
                 teamId = SecurityUtils.getLoginUser().getDeptId();
                 dto.setCheckedTeamId(teamId);
             } else if (roleKeyList.contains(RoleTypeEnum.SecurityCheck.getCode())) {
-                dto.setIsSelfCheck(null);
+                dto.setIsSelfCheck(0);
                 userId = SecurityUtils.getLoginUser().getUserId();
                 dto.setCheckedUserId(userId);
             } else {
@@ -986,6 +1010,8 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setCheckedTeamId(teamId);
             } else if (ObjUtil.isNotNull(departmentId)) {
                 dto.setCheckedDepartmentId(departmentId);
+            } else if (ObjUtil.isNotNull(brigadeId)) {
+                dto.setCheckedBrigadeId(brigadeId);
             } else {
                 return null;
             }
@@ -1000,6 +1026,11 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 if (roleKeyList.contains(RoleTypeEnum.admin.getCode()) || roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
                     userId = null;
                     dto.setCheckedUserId(userId);
+                } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                    userId = null;
+                    dto.setCheckedUserId(userId);
+                    brigadeId = sysUser.getDeptId();
+                    dto.setCheckedBrigadeId(brigadeId);
                 } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                     userId = null;
                     dto.setCheckedUserId(userId);
@@ -1021,7 +1052,8 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 List<SysDept> deptList = sysDeptService.selectAllDept(sysUser.getDeptId());
                 if (CollUtil.isNotEmpty(deptList)) {
                     SysDept team = deptList.stream().filter(item -> StrUtil.equals(DeptType.TEAMS.getCode(), item.getDeptType())).findFirst().orElse(null);
-                    SysDept department = deptList.stream().filter(item -> StrUtil.equals(DeptType.DEPARTMENT.getCode(), item.getDeptType())).findFirst().orElse(null);
+                    SysDept department = deptList.stream().filter(item -> StrUtil.equals(DeptType.MANAGER.getCode(), item.getDeptType())).findFirst().orElse(null);
+                    SysDept brigade = deptList.stream().filter(item -> StrUtil.equals(DeptType.BRIGADE.getCode(), item.getDeptType())).findFirst().orElse(null);
                     SysDept station = deptList.stream().filter(item -> StrUtil.equals(DeptType.STATION.getCode(), item.getDeptType())).findFirst().orElse(null);
                     // 本班排名处理
                     if (ObjUtil.isNotNull(team)) {
@@ -1115,6 +1147,52 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                             }
                         }
                     }
+                    // 本大队排名处理
+                    if (ObjUtil.isNotNull(brigade)) {
+                        List<CheckLargeScreenCorrectionPortraitSqlDto> brigadeList = all.stream().filter(item -> ObjUtil.equals(item.getCheckedBrigadeId(), brigade.getDeptId())).collect(Collectors.toList());
+                        if (CollUtil.isNotEmpty(brigadeList)) {
+                            Map<Long, Long> userIdCountMap = brigadeList.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getUserId, Collectors.counting()));
+                            Map<Long, Long> tempMap = new HashMap<>();
+                            List<SysUser> sysUserTempList = sysUserService.selectUserByDeptId(brigade.getDeptId());
+                            sysUserTempList = sysUserTempList.stream().filter(item -> item.getRoles().stream().anyMatch(sysRole -> RoleTypeEnum.banzuzhang.getCode().equals(sysRole.getRoleKey()) || RoleTypeEnum.SecurityCheck.getCode().equals(sysRole.getRoleKey()))).collect(Collectors.toList());
+                            if (CollUtil.isNotEmpty(sysUserTempList)) {
+                                List<Long> sysUserIdTempList = sysUserTempList.stream().map(SysUser::getUserId).distinct().collect(Collectors.toList());
+                                sysUserIdTempList.forEach(item -> {
+                                    tempMap.put(item, userIdCountMap.getOrDefault(item, 0L));
+                                });
+                                result.setBrigadeTotal(sysUserIdTempList.size());
+                                // 1. 按值升序排序
+                                List<Map.Entry<Long, Long>> sortedEntries = tempMap.entrySet()
+                                        .stream()
+                                        .sorted(Map.Entry.comparingByValue())
+                                        .collect(Collectors.toList());
+                                // 2. 计算排名（考虑并列情况）
+                                Map<Long, Integer> rankMap = new HashMap<>();
+                                int currentRank = 1;
+                                Long prevValue = null;
+                                int sameValueCount = 1; // 记录相同值的用户数
+                                for (int i = 0; i < sortedEntries.size(); i++) {
+                                    Map.Entry<Long, Long> entry = sortedEntries.get(i);
+                                    Long currentValue = entry.getValue();
+                                    if (prevValue != null && !currentValue.equals(prevValue)) {
+                                        // 如果当前值与前一个值不同，更新排名
+                                        currentRank += sameValueCount;
+                                        sameValueCount = 1;
+                                    } else if (prevValue != null) {
+                                        // 如果当前值与前一个值相同，排名不变，但增加相同值的计数
+                                        sameValueCount++;
+                                    }
+                                    // 存储用户ID和排名
+                                    rankMap.put(entry.getKey(), currentRank);
+                                    prevValue = currentValue;
+                                }
+                                // 3. 查询指定排名
+                                Long targetId = userId;
+                                Integer integer = rankMap.get(targetId);
+                                result.setBrigadeRanking(integer);
+                            }
+                        }
+                    }
                     // 本站排名处理
                     if (ObjUtil.isNotNull(station)) {
                         List<CheckLargeScreenCorrectionPortraitSqlDto> stationList = all;
@@ -1216,13 +1294,59 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                     result.setDepartmentRanking(integer);
                 }
             }
+            // 本大队排名处理
+            SysDept sysDeptKs = sysDeptService.selectDeptById(ksId);
+            Long ddId = sysDeptKs.getParentId();
+            List<CheckLargeScreenCorrectionPortraitSqlDto> brigadeList = all.stream().filter(item -> ObjUtil.equals(item.getCheckedBrigadeId(), ddId)).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(brigadeList)) {
+                Map<Long, Long> teamIdCountMap = brigadeList.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedTeamId, Collectors.counting()));
+                Map<Long, Long> tempMap = new HashMap<>();
+                List<SysDept> deptList = sysDeptService.selectAllDept(ddId);
+                deptList = deptList.stream().filter(item -> StrUtil.equals(DeptType.TEAMS.getCode(), item.getDeptType())).collect(Collectors.toList());
+                if (CollUtil.isNotEmpty(deptList)) {
+                    List<Long> teamIdTempList = deptList.stream().map(SysDept::getDeptId).distinct().collect(Collectors.toList());
+                    teamIdTempList.forEach(item -> {
+                        tempMap.put(item, teamIdCountMap.getOrDefault(item, 0L));
+                    });
+                    result.setBrigadeTotal(teamIdTempList.size());
+                    // 1. 按值升序排序
+                    List<Map.Entry<Long, Long>> sortedEntries = tempMap.entrySet()
+                            .stream()
+                            .sorted(Map.Entry.comparingByValue())
+                            .collect(Collectors.toList());
+                    // 2. 计算排名（考虑并列情况）
+                    Map<Long, Integer> rankMap = new HashMap<>();
+                    int currentRank = 1;
+                    Long prevValue = null;
+                    int sameValueCount = 1; // 记录相同值的用户数
+                    for (int i = 0; i < sortedEntries.size(); i++) {
+                        Map.Entry<Long, Long> entry = sortedEntries.get(i);
+                        Long currentValue = entry.getValue();
+                        if (prevValue != null && !currentValue.equals(prevValue)) {
+                            // 如果当前值与前一个值不同，更新排名
+                            currentRank += sameValueCount;
+                            sameValueCount = 1;
+                        } else if (prevValue != null) {
+                            // 如果当前值与前一个值相同，排名不变，但增加相同值的计数
+                            sameValueCount++;
+                        }
+                        // 存储用户ID和排名
+                        rankMap.put(entry.getKey(), currentRank);
+                        prevValue = currentValue;
+                    }
+                    // 3. 查询指定排名
+                    Long targetId = teamId;
+                    Integer integer = rankMap.get(targetId);
+                    result.setBrigadeRanking(integer);
+                }
+            }
             // 本站排名处理
             List<CheckLargeScreenCorrectionPortraitSqlDto> stationList = all;
             if (CollUtil.isNotEmpty(stationList)) {
                 Map<Long, Long> teamIdCountMap = stationList.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedTeamId, Collectors.counting()));
                 Map<Long, Long> tempMap = new HashMap<>();
                 List<SysDept> deptList = sysDeptService.selectDeptInfoAll(new SysDept());
-                deptList = deptList.stream().filter(item -> StrUtil.equals("TEAMS", item.getDeptType())).collect(Collectors.toList());
+                deptList = deptList.stream().filter(item -> StrUtil.equals(DeptType.TEAMS.getCode(), item.getDeptType())).collect(Collectors.toList());
                 if (CollUtil.isNotEmpty(deptList)) {
                     List<Long> teamIdTempList = deptList.stream().map(SysDept::getDeptId).distinct().collect(Collectors.toList());
                     teamIdTempList.forEach(item -> {
@@ -1267,12 +1391,58 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             if (CollUtil.isEmpty(target)) {
                 return null;
             }
+            // 本大队排名处理
+            SysDept sysDeptKs = sysDeptService.selectDeptById(departmentId);
+            Long ddId = sysDeptKs.getParentId();
+            List<CheckLargeScreenCorrectionPortraitSqlDto> brigadeList = all.stream().filter(item -> ObjUtil.equals(item.getCheckedBrigadeId(), ddId)).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(brigadeList)) {
+                Map<Long, Long> departmentIdCountMap = brigadeList.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedDepartmentId, Collectors.counting()));
+                Map<Long, Long> tempMap = new HashMap<>();
+                List<SysDept> deptList = sysDeptService.selectAllDept(ddId);
+                deptList = deptList.stream().filter(item -> StrUtil.equals(DeptType.MANAGER.getCode(), item.getDeptType())).collect(Collectors.toList());
+                if (CollUtil.isNotEmpty(deptList)) {
+                    List<Long> departmentIdTempList = deptList.stream().map(SysDept::getDeptId).distinct().collect(Collectors.toList());
+                    departmentIdTempList.forEach(item -> {
+                        tempMap.put(item, departmentIdCountMap.getOrDefault(item, 0L));
+                    });
+                    result.setBrigadeTotal(departmentIdTempList.size());
+                    // 1. 按值升序排序
+                    List<Map.Entry<Long, Long>> sortedEntries = tempMap.entrySet()
+                            .stream()
+                            .sorted(Map.Entry.comparingByValue())
+                            .collect(Collectors.toList());
+                    // 2. 计算排名（考虑并列情况）
+                    Map<Long, Integer> rankMap = new HashMap<>();
+                    int currentRank = 1;
+                    Long prevValue = null;
+                    int sameValueCount = 1; // 记录相同值的用户数
+                    for (int i = 0; i < sortedEntries.size(); i++) {
+                        Map.Entry<Long, Long> entry = sortedEntries.get(i);
+                        Long currentValue = entry.getValue();
+                        if (prevValue != null && !currentValue.equals(prevValue)) {
+                            // 如果当前值与前一个值不同，更新排名
+                            currentRank += sameValueCount;
+                            sameValueCount = 1;
+                        } else if (prevValue != null) {
+                            // 如果当前值与前一个值相同，排名不变，但增加相同值的计数
+                            sameValueCount++;
+                        }
+                        // 存储用户ID和排名
+                        rankMap.put(entry.getKey(), currentRank);
+                        prevValue = currentValue;
+                    }
+                    // 3. 查询指定排名
+                    Long targetId = departmentId;
+                    Integer integer = rankMap.get(targetId);
+                    result.setBrigadeRanking(integer);
+                }
+            }
             // 本站排名处理
             List<CheckLargeScreenCorrectionPortraitSqlDto> stationList = all;
             Map<Long, Long> departmentIdCountMap = stationList.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedDepartmentId, Collectors.counting()));
             Map<Long, Long> tempMap = new HashMap<>();
             List<SysDept> deptList = sysDeptService.selectDeptInfoAll(new SysDept());
-            deptList = deptList.stream().filter(item -> StrUtil.equals("DEPARTMENT", item.getDeptType())).collect(Collectors.toList());
+            deptList = deptList.stream().filter(item -> StrUtil.equals(DeptType.MANAGER.getCode(), item.getDeptType())).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(deptList)) {
                 List<Long> departmentIdTempList = deptList.stream().map(SysDept::getDeptId).distinct().collect(Collectors.toList());
                 departmentIdTempList.forEach(item -> {
@@ -1324,13 +1494,13 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         result.setOverTimeUnfinishedCount((int) correctionTypeMap.values().stream().filter(item -> StrUtil.equals("OVER_TIME_UNFINISHED", item)).count());
         result.setOtherCount((int) correctionTypeMap.values().stream().filter(item -> StrUtil.equals("OTHER", item)).count());
         // 部门及分类处理
-        Map<String, Long> categoryCodeCountMap = target.stream().collect(Collectors.groupingBy(item -> item.getCheckedDepartmentId() + "***" + item.getCategoryCodeOne(), Collectors.counting()));
+        Map<String, Long> categoryCodeCountMap = target.stream().collect(Collectors.groupingBy(item -> item.getCheckedBrigadeId() + "***" + item.getCategoryCodeOne(), Collectors.counting()));
         BaseCheckCategory baseCheckCategory = new BaseCheckCategory();
         baseCheckCategory.setLevel(1);
         List<BaseCheckCategory> baseCheckCategoryList = baseCheckCategoryService.selectBaseCheckCategoryList(baseCheckCategory);
         List<CheckLargeScreenProblemDto> resultItemTempList = new ArrayList<>();
-        List<String> checkedDepartmentList = target.stream().map(item -> item.getCheckedDepartmentId() + "###" + item.getCheckedDepartmentName()).distinct().collect(Collectors.toList());
-        checkedDepartmentList.forEach(item -> {
+        List<String> checkedBrigadeList = target.stream().map(item -> item.getCheckedBrigadeId() + "###" + item.getCheckedBrigadeName()).distinct().collect(Collectors.toList());
+        checkedBrigadeList.forEach(item -> {
             String[] split = item.split("###");
             Long deptId = Long.valueOf(split[0]);
             String deptName = split[1];

airport-check/src/main/resources/mapper/check/CheckLargeScreenMapper.xml

@@ -661,6 +661,8 @@
 
     <select id="portrait" resultType="com.sundot.airport.check.domain.CheckLargeScreenCorrectionPortraitSqlDto">
         select cc.id id,
+        cc.checked_brigade_id checkedBrigadeId,
+        cc.checked_brigade_name checkedBrigadeName,
         cc.checked_department_id checkedDepartmentId,
         cc.checked_department_name checkedDepartmentName,
         cc.checked_team_id checkedTeamId,