bug修复

airport-blocked/src/main/java/com/sundot/airport/blocked/domain/BlockedMissCheckStatistics.java

@@ -173,7 +173,7 @@ public class BlockedMissCheckStatistics extends BaseEntity {
     private String monthlyAssessment;
 
     /** 本月自测有无漏检（0-无，1-有） */
-    @Excel(name = "本月自测有无漏检", readConverterExp = "0=无,1=有")
+    @Excel(name = "本月自测有无漏检")
     @ApiModelProperty("本月自测有无漏检 0=无,1=有")
     private Integer selfTestHasMissCheck;
 

airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedDashboardServiceImpl.java

@@ -334,10 +334,8 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     public List<BlockedRankingDTO> getSupervisorRanking(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedRankingDTO> resultList = blockedDashboardMapper.selectSupervisorRanking(queryDTO);
         if (CollectionUtil.isNotEmpty(resultList)) {
-            // 计算排名
-            for (int i = 0; i < resultList.size(); i++) {
-                resultList.get(i).setRank(i + 1);
-            }
+            // 计算并列排名并限制前30条
+            return calculateDenseRankingWithLimit(resultList, 30);
         }
         return resultList != null ? resultList : Collections.emptyList();
     }
@@ -352,10 +350,8 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     public List<BlockedRankingDTO> getTeamLeaderRanking(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedRankingDTO> resultList = blockedDashboardMapper.selectTeamLeaderRanking(queryDTO);
         if (CollectionUtil.isNotEmpty(resultList)) {
-            // 计算排名
-            for (int i = 0; i < resultList.size(); i++) {
-                resultList.get(i).setRank(i + 1);
-            }
+            // 计算并列排名并限制前30条
+            return calculateDenseRankingWithLimit(resultList, 30);
         }
         return resultList != null ? resultList : Collections.emptyList();
     }
@@ -370,10 +366,8 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     public List<BlockedRankingDTO> getReviewedUserRanking(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedRankingDTO> resultList = blockedDashboardMapper.selectReviewedUserRanking(queryDTO);
         if (CollectionUtil.isNotEmpty(resultList)) {
-            // 计算排名
-            for (int i = 0; i < resultList.size(); i++) {
-                resultList.get(i).setRank(i + 1);
-            }
+            // 计算并列排名并限制前30条
+            return calculateDenseRankingWithLimit(resultList, 30);
         }
         return resultList != null ? resultList : Collections.emptyList();
     }
@@ -521,7 +515,7 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
         // 3. 批量查询所有部门信息，构建大队ID映射缓存
         Map<Long, Long> deptToBrigadeMap = buildDeptToBrigadeMap(allDeptIds);
         
-        // 4. 在Java层按大队分组统计
+        // 4. 按大队分组统计
         Map<Long, BlockedCertificateLevelDTO> brigadeMap = new LinkedHashMap<>();
         
         for (Map<String, Object> row : rawData) {
@@ -776,6 +770,10 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
     @Override
     public List<BlockedRankingDTO> getBrigadeSupervisorRanking(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedRankingDTO> resultList = blockedDashboardMapper.selectBrigadeSupervisorRanking(queryDTO);
+        if (CollectionUtil.isNotEmpty(resultList)) {
+            // 计算并列排名并限制前10条
+            return calculateDenseRankingWithLimit(resultList, 10);
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 
@@ -785,14 +783,18 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
      * 数据筛选：分管班组长不为空
      * 排行字段：分管班组长
      * 排行依据：统计记录总数
-     * 显示行数：显示前10行
+     * 显示行数：显示前10条（并列排名）
      * 
      * @param queryDTO 查询参数
-     * @return 班组排行榜列表（前10名）
+     * @return 班组排行榜列表（前10条）
      */
     @Override
     public List<BlockedRankingDTO> getBrigadeTeamLeaderRanking(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedRankingDTO> resultList = blockedDashboardMapper.selectBrigadeTeamLeaderRanking(queryDTO);
+        if (CollectionUtil.isNotEmpty(resultList)) {
+            // 计算并列排名并限制前10条
+            return calculateDenseRankingWithLimit(resultList, 10);
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 
@@ -802,14 +804,18 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
      * 数据筛选：被回查人不为空
      * 排行字段：被回查人
      * 排行依据：统计记录总数
-     * 显示行数：显示前10行
+     * 显示行数：显示前10条（并列排名）
      * 
      * @param queryDTO 查询参数
-     * @return 人员排行榜列表（前10名）
+     * @return 人员排行榜列表（前10条）
      */
     @Override
     public List<BlockedRankingDTO> getBrigadeReviewedUserRanking(BlockedDashboardQueryDTO queryDTO) {
         List<BlockedRankingDTO> resultList = blockedDashboardMapper.selectBrigadeReviewedUserRanking(queryDTO);
+        if (CollectionUtil.isNotEmpty(resultList)) {
+            // 计算并列排名并限制前10条
+            return calculateDenseRankingWithLimit(resultList, 10);
+        }
         return resultList != null ? resultList : Collections.emptyList();
     }
 
@@ -997,4 +1003,42 @@ public class BlockedDashboardServiceImpl implements IBlockedDashboardService {
                 return levelCode;
         }
     }
+
+    /**
+     * 计算并列排名并限制前N条
+     * 并列排名规则：相同totalCount的记录排名相同，下一个不同值的排名紧接其后
+     * 限制规则：只返回排名序号 <= maxRank 的记录
+     *
+     * @param resultList 排行榜数据列表（已按totalCount降序排序）
+     * @param maxRank 最大排名序号（站级30，大队10）
+     * @return 过滤后的排行榜列表
+     */
+    private List<BlockedRankingDTO> calculateDenseRankingWithLimit(List<BlockedRankingDTO> resultList, int maxRank) {
+        if (resultList == null || resultList.isEmpty()) {
+            return resultList;
+        }
+
+        List<BlockedRankingDTO> result = new ArrayList<>();
+        int currentRank = 1;  // 当前排名
+        Integer previousCount = null;  // 上一个记录的totalCount
+
+        for (BlockedRankingDTO item : resultList) {
+            Integer currentCount = item.getTotalCount();
+            
+            // 如果totalCount与上一个不同，更新排名
+            if (previousCount == null || !currentCount.equals(previousCount)) {
+                // 如果当前排名已经超过限制，停止添加
+                if (currentRank > maxRank) {
+                    break;
+                }
+                previousCount = currentCount;
+            }
+            
+            // 设置排名并添加到结果列表
+            item.setRank(currentRank);
+            result.add(item);
+        }
+
+        return result;
+    }
 }

airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedMissCheckStatisticsServiceImpl.java

@@ -158,7 +158,6 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
                     data.setCreateTime(DateUtils.getNowDate());
                     blockedMissCheckStatisticsMapper.insertBlockedMissCheckStatistics(data);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】导入成功");
                 } else if (isUpdateSupport) {
                     // 更新
                     BlockedMissCheckStatistics old = existingList.get(0);
@@ -167,7 +166,6 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
                     data.setUpdateTime(DateUtils.getNowDate());
                     blockedMissCheckStatisticsMapper.updateBlockedMissCheckStatistics(data);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】更新成功");
                 } else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】已存在");
@@ -183,7 +181,7 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
         } else {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条");
         }
         return successMsg.toString();
     }

airport-blocked/src/main/resources/mapper/blocked/BlockedDashboardMapper.xml

@@ -539,7 +539,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             COUNT(1) as count
         FROM blocked_miss_check_statistics
         WHERE del_flag = '0'
-        AND area_id IS NOT NULL
         AND miss_check_reason_category IS NOT NULL
         AND miss_check_reason_category != ''
         <if test="startTime != null and endTime != null">
@@ -633,7 +632,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <!-- 查询大队开机人员证书分布(用于柱状图) -->
-    <!-- 查询大队证书等级分布(按大队) - 返回用户和部门信息，由Java层处理 -->
+    <!-- 查询大队证书等级分布(按大队)  -->
     <select id="selectBrigadeCertificateDistribution" resultType="java.util.HashMap">
         SELECT 
             u.user_id,
@@ -646,9 +645,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND u.status = '0'
         AND u.qualification_level IS NOT NULL
         AND u.qualification_level != ''
-        <if test="terminalId != null">
-            AND d.terminal_id = #{terminalId}
-        </if>
     </select>
 
     <!-- 查询两楼每日查堵走势(按大队) -->