组织画像-学习成长

airport-system/src/main/java/com/sundot/airport/system/domain/SysLargeScreenLearningGrowthDto.java

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

airport-system/src/main/java/com/sundot/airport/system/domain/SysLargeScreenLearningGrowthQueryParamDto.java

@@ -14,6 +14,11 @@ import lombok.Data;
 public class SysLargeScreenLearningGrowthQueryParamDto extends BaseLargeScreenQueryParamDto {
 
     /**
+     * 大队ID
+     */
+    private Long brigadeId;
+
+    /**
      * 科室ID
      */
     private Long departmentId;

airport-system/src/main/java/com/sundot/airport/system/domain/SysLargeScreenLearningGrowthSqlDto.java

@@ -27,6 +27,16 @@ public class SysLargeScreenLearningGrowthSqlDto {
     private String zjDeptName;
 
     /**
+     * 大队ID
+     */
+    private Long ddDeptId;
+
+    /**
+     * 大队名称
+     */
+    private String ddDeptName;
+
+    /**
      * 科室ID
      */
     private Long ksDeptId;

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysLearningGrowthServiceImpl.java

@@ -214,10 +214,11 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
         }
 
         // 查询条件处理
+        Long brigadeId = dto.getBrigadeId();
         Long departmentId = dto.getDepartmentId();
         Long teamId = dto.getTeamId();
         Long userId = dto.getUserId();
-        if (ObjUtil.isNull(departmentId) && ObjUtil.isNull(teamId) && ObjUtil.isNull(userId)) {
+        if (ObjUtil.isNull(brigadeId) && ObjUtil.isNull(departmentId) && ObjUtil.isNull(teamId) && ObjUtil.isNull(userId)) {
             List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
             if (CollUtil.isEmpty(roles)) {
                 return Collections.emptyList();
@@ -227,6 +228,9 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
 
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
 
+            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                brigadeId = SecurityUtils.getLoginUser().getDeptId();
+                dto.setBrigadeId(brigadeId);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 departmentId = SecurityUtils.getLoginUser().getDeptId();
                 dto.setDepartmentId(departmentId);
@@ -246,6 +250,8 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
                 dto.setTeamId(teamId);
             } else if (ObjUtil.isNotNull(departmentId)) {
                 dto.setDepartmentId(departmentId);
+            } else if (ObjUtil.isNotNull(brigadeId)) {
+                dto.setBrigadeId(brigadeId);
             } else {
                 return Collections.emptyList();
             }
@@ -260,6 +266,11 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
                 if (roleKeyList.contains(RoleTypeEnum.admin.getCode()) || roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
                     userId = null;
                     dto.setUserId(userId);
+                } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                    userId = null;
+                    dto.setUserId(userId);
+                    brigadeId = sysUser.getDeptId();
+                    dto.setBrigadeId(brigadeId);
                 } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                     userId = null;
                     dto.setUserId(userId);
@@ -305,7 +316,8 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
             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)) {
@@ -399,6 +411,52 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
                         resultItem.setDepartmentRanking(integer);
                     }
                 }
+                // 本大队排名处理
+                if (ObjUtil.isNotNull(brigade)) {
+                    List<SysLargeScreenLearningGrowthSqlDto> brigadeList = all.stream().filter(item -> ObjUtil.equals(item.getDdDeptId(), brigade.getDeptId())).collect(Collectors.toList());
+                    if (CollUtil.isNotEmpty(brigadeList)) {
+                        Map<Long, BigDecimal> avgMap = brigadeList.stream()
+                                .filter(item -> item.getExamScore() != null)
+                                .collect(Collectors.groupingBy(
+                                        SysLargeScreenLearningGrowthSqlDto::getUserId,
+                                        Collectors.collectingAndThen(
+                                                Collectors.averagingDouble(record -> record.getExamScore().doubleValue()),
+                                                avg -> BigDecimal.valueOf(avg).setScale(2, RoundingMode.HALF_UP)
+                                        )
+                                ));
+                        long count = avgMap.keySet().stream().count();
+                        resultItem.setBrigadeTotal((int) count);
+                        // 1. 按值升序排序
+                        List<Map.Entry<Long, BigDecimal>> sortedEntries = avgMap.entrySet()
+                                .stream()
+                                .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
+                                .collect(Collectors.toList());
+                        // 2. 计算排名（考虑并列情况）
+                        Map<Long, Integer> rankMap = new HashMap<>();
+                        int currentRank = 1;
+                        BigDecimal prevValue = null;
+                        int sameValueCount = 1; // 记录相同值的用户数
+                        for (int i = 0; i < sortedEntries.size(); i++) {
+                            Map.Entry<Long, BigDecimal> entry = sortedEntries.get(i);
+                            BigDecimal 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);
+                        resultItem.setBrigadeRanking(integer);
+                    }
+                }
                 // 本站排名处理
                 if (ObjUtil.isNotNull(station)) {
                     List<SysLargeScreenLearningGrowthSqlDto> stationList = all.stream().filter(item -> ObjUtil.equals(item.getZjDeptId(), station.getDeptId())).collect(Collectors.toList());
@@ -524,7 +582,52 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
                 Integer integer = rankMapTeam.get(targetId);
                 resultItem.setDepartmentRanking(integer);
             }
-
+            // 本大队排名处理
+            SysDept sysDeptKs = sysDeptService.selectDeptById(ksId);
+            Long ddId = sysDeptKs.getParentId();
+            List<SysLargeScreenLearningGrowthSqlDto> brigadeList = all.stream().filter(item -> ObjUtil.equals(item.getDdDeptId(), ddId)).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(brigadeList)) {
+                Map<Long, BigDecimal> avgMap = brigadeList.stream()
+                        .filter(item -> item.getExamScore() != null)
+                        .collect(Collectors.groupingBy(
+                                SysLargeScreenLearningGrowthSqlDto::getBzDeptId,
+                                Collectors.collectingAndThen(
+                                        Collectors.averagingDouble(record -> record.getExamScore().doubleValue()),
+                                        avg -> BigDecimal.valueOf(avg).setScale(2, RoundingMode.HALF_UP)
+                                )
+                        ));
+                long count = avgMap.keySet().stream().count();
+                resultItem.setBrigadeTotal((int) count);
+                // 1. 按值升序排序
+                List<Map.Entry<Long, BigDecimal>> sortedEntriesTeam = avgMap.entrySet()
+                        .stream()
+                        .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
+                        .collect(Collectors.toList());
+                // 2. 计算排名（考虑并列情况）
+                Map<Long, Integer> rankMapTeam = new HashMap<>();
+                int currentRank = 1;
+                BigDecimal prevValueTeam = null;
+                int sameValueCount = 1; // 记录相同值的用户数
+                for (int i = 0; i < sortedEntriesTeam.size(); i++) {
+                    Map.Entry<Long, BigDecimal> entry = sortedEntriesTeam.get(i);
+                    BigDecimal currentValue = entry.getValue();
+                    if (prevValueTeam != null && !currentValue.equals(prevValueTeam)) {
+                        // 如果当前值与前一个值不同，更新排名
+                        currentRank += sameValueCount;
+                        sameValueCount = 1;
+                    } else if (prevValueTeam != null) {
+                        // 如果当前值与前一个值相同，排名不变，但增加相同值的计数
+                        sameValueCount++;
+                    }
+                    // 存储用户ID和排名
+                    rankMapTeam.put(entry.getKey(), currentRank);
+                    prevValueTeam = currentValue;
+                }
+                // 3. 查询指定排名
+                Long targetId = teamId;
+                Integer integer = rankMapTeam.get(targetId);
+                resultItem.setBrigadeRanking(integer);
+            }
             // 本站排名处理
             SysDept sysDeptDepartment = sysDeptService.selectDeptById(ksId);
             Long stationId = sysDeptDepartment.getParentId();
@@ -602,10 +705,56 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
                     .reduce(BigDecimal::add)
                     .map(sum -> sum.divide(BigDecimal.valueOf(target.size()), 2, RoundingMode.HALF_UP))
                     .orElse(BigDecimal.ZERO));
-
+            // 本大队排名处理
+            SysDept sysDeptKs = sysDeptService.selectDeptById(departmentId);
+            Long ddId = sysDeptKs.getParentId();
+            List<SysLargeScreenLearningGrowthSqlDto> brigadeList = all.stream().filter(item -> ObjUtil.equals(item.getDdDeptId(), ddId)).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(brigadeList)) {
+                Map<Long, BigDecimal> avgMap = brigadeList.stream()
+                        .filter(item -> item.getExamScore() != null)
+                        .collect(Collectors.groupingBy(
+                                SysLargeScreenLearningGrowthSqlDto::getKsDeptId,
+                                Collectors.collectingAndThen(
+                                        Collectors.averagingDouble(record -> record.getExamScore().doubleValue()),
+                                        avg -> BigDecimal.valueOf(avg).setScale(2, RoundingMode.HALF_UP)
+                                )
+                        ));
+                long count = avgMap.keySet().stream().count();
+                resultItem.setBrigadeTotal((int) count);
+                // 1. 按值升序排序
+                List<Map.Entry<Long, BigDecimal>> sortedEntriesTeam = avgMap.entrySet()
+                        .stream()
+                        .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
+                        .collect(Collectors.toList());
+                // 2. 计算排名（考虑并列情况）
+                Map<Long, Integer> rankMapTeam = new HashMap<>();
+                int currentRank = 1;
+                BigDecimal prevValueTeam = null;
+                int sameValueCount = 1; // 记录相同值的用户数
+                for (int i = 0; i < sortedEntriesTeam.size(); i++) {
+                    Map.Entry<Long, BigDecimal> entry = sortedEntriesTeam.get(i);
+                    BigDecimal currentValue = entry.getValue();
+                    if (prevValueTeam != null && !currentValue.equals(prevValueTeam)) {
+                        // 如果当前值与前一个值不同，更新排名
+                        currentRank += sameValueCount;
+                        sameValueCount = 1;
+                    } else if (prevValueTeam != null) {
+                        // 如果当前值与前一个值相同，排名不变，但增加相同值的计数
+                        sameValueCount++;
+                    }
+                    // 存储用户ID和排名
+                    rankMapTeam.put(entry.getKey(), currentRank);
+                    prevValueTeam = currentValue;
+                }
+                // 3. 查询指定排名
+                Long targetId = departmentId;
+                Integer integer = rankMapTeam.get(targetId);
+                resultItem.setBrigadeRanking(integer);
+            }
+            result.add(resultItem);
             // 本站排名处理
-            SysDept sysDeptDepartmentId = sysDeptService.selectDeptById(departmentId);
-            Long stationId = sysDeptDepartmentId.getParentId();
+            SysDept sysDeptBrigade = sysDeptService.selectDeptById(ddId);
+            Long stationId = sysDeptBrigade.getParentId();
             List<SysLargeScreenLearningGrowthSqlDto> stationList = all.stream().filter(item -> ObjUtil.equals(item.getZjDeptId(), stationId)).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(stationList)) {
                 Map<Long, BigDecimal> avgMap = stationList.stream()
@@ -650,14 +799,91 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
                 resultItem.setStationRanking(integer);
             }
             result.add(resultItem);
+        } else if (ObjUtil.isNotNull(brigadeId)) {
+            // 大队级
+            Long finalBrigadeId = brigadeId;
+            List<SysLargeScreenLearningGrowthSqlDto> target = all.stream()
+                    .filter(item -> ObjUtil.equals(item.getDdDeptId(), finalBrigadeId))
+                    .collect(Collectors.toList());
+            if (CollUtil.isEmpty(target)) {
+                return Collections.emptyList();
+            }
+            SysLargeScreenLearningGrowthDto resultItem = new SysLargeScreenLearningGrowthDto();
+            resultItem.setId(brigadeId);
+            resultItem.setName(target.get(0).getDdDeptName());
+            resultItem.setHighestScore(target
+                    .stream()
+                    .map(SysLargeScreenLearningGrowthSqlDto::getExamScore)
+                    .filter(ObjUtil::isNotNull)
+                    .reduce(BigDecimal::max)
+                    .orElse(BigDecimal.ZERO));
+            resultItem.setLowestScore(target
+                    .stream()
+                    .map(SysLargeScreenLearningGrowthSqlDto::getExamScore)
+                    .filter(ObjUtil::isNotNull)
+                    .reduce(BigDecimal::min)
+                    .orElse(BigDecimal.ZERO));
+            resultItem.setAverageScore(target.stream()
+                    .map(SysLargeScreenLearningGrowthSqlDto::getExamScore)
+                    .filter(ObjUtil::isNotNull)
+                    .reduce(BigDecimal::add)
+                    .map(sum -> sum.divide(BigDecimal.valueOf(target.size()), 2, RoundingMode.HALF_UP))
+                    .orElse(BigDecimal.ZERO));
+            // 本站排名处理
+            SysDept sysDeptBrigade = sysDeptService.selectDeptById(brigadeId);
+            Long stationId = sysDeptBrigade.getParentId();
+            List<SysLargeScreenLearningGrowthSqlDto> stationList = all.stream().filter(item -> ObjUtil.equals(item.getZjDeptId(), stationId)).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(stationList)) {
+                Map<Long, BigDecimal> avgMap = stationList.stream()
+                        .filter(item -> item.getExamScore() != null)
+                        .collect(Collectors.groupingBy(
+                                SysLargeScreenLearningGrowthSqlDto::getDdDeptId,
+                                Collectors.collectingAndThen(
+                                        Collectors.averagingDouble(record -> record.getExamScore().doubleValue()),
+                                        avg -> BigDecimal.valueOf(avg).setScale(2, RoundingMode.HALF_UP)
+                                )
+                        ));
+                long count = avgMap.keySet().stream().count();
+                resultItem.setStationTotal((int) count);
+                // 1. 按值升序排序
+                List<Map.Entry<Long, BigDecimal>> sortedEntriesTeam = avgMap.entrySet()
+                        .stream()
+                        .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
+                        .collect(Collectors.toList());
+                // 2. 计算排名（考虑并列情况）
+                Map<Long, Integer> rankMapTeam = new HashMap<>();
+                int currentRank = 1;
+                BigDecimal prevValueTeam = null;
+                int sameValueCount = 1; // 记录相同值的用户数
+                for (int i = 0; i < sortedEntriesTeam.size(); i++) {
+                    Map.Entry<Long, BigDecimal> entry = sortedEntriesTeam.get(i);
+                    BigDecimal currentValue = entry.getValue();
+                    if (prevValueTeam != null && !currentValue.equals(prevValueTeam)) {
+                        // 如果当前值与前一个值不同，更新排名
+                        currentRank += sameValueCount;
+                        sameValueCount = 1;
+                    } else if (prevValueTeam != null) {
+                        // 如果当前值与前一个值相同，排名不变，但增加相同值的计数
+                        sameValueCount++;
+                    }
+                    // 存储用户ID和排名
+                    rankMapTeam.put(entry.getKey(), currentRank);
+                    prevValueTeam = currentValue;
+                }
+                // 3. 查询指定排名
+                Long targetId = brigadeId;
+                Integer integer = rankMapTeam.get(targetId);
+                resultItem.setStationRanking(integer);
+            }
+            result.add(resultItem);
         } else {
             // 站级
-            Map<Long, String> allMap = all.stream().collect(Collectors.toMap(SysLargeScreenLearningGrowthSqlDto::getKsDeptId, SysLargeScreenLearningGrowthSqlDto::getKsDeptName, (oldValue, newValue) -> newValue));
-            Map<Long, List<SysLargeScreenLearningGrowthSqlDto>> groupingByMap = all.stream().collect(Collectors.groupingBy(SysLargeScreenLearningGrowthSqlDto::getKsDeptId));
-            groupingByMap.forEach((ksDeptId, sysLargeScreenLearningGrowthSqlDtolist) -> {
+            Map<Long, String> allMap = all.stream().collect(Collectors.toMap(SysLargeScreenLearningGrowthSqlDto::getDdDeptId, SysLargeScreenLearningGrowthSqlDto::getDdDeptName, (oldValue, newValue) -> newValue));
+            Map<Long, List<SysLargeScreenLearningGrowthSqlDto>> groupingByMap = all.stream().collect(Collectors.groupingBy(SysLargeScreenLearningGrowthSqlDto::getDdDeptId));
+            groupingByMap.forEach((ddDeptId, sysLargeScreenLearningGrowthSqlDtolist) -> {
                 SysLargeScreenLearningGrowthDto resultItem = new SysLargeScreenLearningGrowthDto();
-                resultItem.setId(ksDeptId);
-                resultItem.setName(allMap.get(ksDeptId));
+                resultItem.setId(ddDeptId);
+                resultItem.setName(allMap.get(ddDeptId));
                 resultItem.setHighestScore(sysLargeScreenLearningGrowthSqlDtolist
                         .stream()
                         .map(SysLargeScreenLearningGrowthSqlDto::getExamScore)

airport-system/src/main/resources/mapper/system/SysLearningGrowthMapper.xml

@@ -121,6 +121,8 @@
             resultType="com.sundot.airport.system.domain.SysLargeScreenLearningGrowthSqlDto">
         select sd_zj.dept_id zjDeptId,
         sd_zj.dept_name zjDeptName,
+        sd_dd.dept_id ddDeptId,
+        sd_dd.dept_name ddDeptName,
         sd_ks.dept_id ksDeptId,
         sd_ks.dept_name ksDeptName,
         sd_bz.dept_id bzDeptId,
@@ -136,7 +138,8 @@
         inner join sys_user su on su.user_name = slg.user_code
         inner join sys_dept sd_bz on sd_bz.dept_id = su.dept_id
         inner join sys_dept sd_ks on sd_ks.dept_id = sd_bz.parent_id
-        inner join sys_dept sd_zj on sd_zj.dept_id = sd_ks.parent_id
+        inner join sys_dept sd_dd on sd_dd.dept_id = sd_ks.parent_id
+        inner join sys_dept sd_zj on sd_zj.dept_id = sd_dd.parent_id
         where 1 = 1
         <if test="userId != null">
             and su.user_id=#{userId}
@@ -147,6 +150,9 @@
         <if test="departmentId != null">
             and sd_ks.dept_id=#{departmentId}
         </if>
+        <if test="brigadeId != null">
+            and sd_dd.dept_id=#{brigadeId}
+        </if>
         <if test="specifiedDate != null">
             and slg.exam_time=#{specifiedDate}
         </if>