漏检统计表

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

@@ -36,7 +36,6 @@ public class BlockedMissCheckStatistics extends BaseEntity {
     private Long terminalId;
 
     /** 航站楼名称 */
-    @Excel(name = "航站楼名称")
     @ApiModelProperty("航站楼名称")
     private String terminalName;
 
@@ -45,7 +44,6 @@ public class BlockedMissCheckStatistics extends BaseEntity {
     private Long areaId;
 
     /** 区域名称 */
-    @Excel(name = "区域名称")
     @ApiModelProperty("区域名称")
     private String areaName;
 

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

@@ -221,6 +221,17 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
     @Override
     @Transactional
     public int insertOrUpdate(BlockedMissCheckStatistics blockedMissCheckStatistics) {
+        // 航站楼+区域+通道 - 通过通道ID查询
+        if (ObjUtil.isNotNull(blockedMissCheckStatistics.getChannelId())) {
+            BasePosition channel = basePositionService.selectBasePositionById(blockedMissCheckStatistics.getChannelId());
+            BasePosition area = basePositionService.selectBasePositionById(channel.getParentId());
+            BasePosition terminal = basePositionService.selectBasePositionById(area.getParentId());
+            blockedMissCheckStatistics.setChannelName(channel.getName());
+            blockedMissCheckStatistics.setAreaId(area.getId());
+            blockedMissCheckStatistics.setAreaName(area.getName());
+            blockedMissCheckStatistics.setTerminalId(terminal.getId());
+            blockedMissCheckStatistics.setTerminalName(terminal.getName());
+        }
         // 检查是否重复
         BlockedMissCheckStatistics existing = checkDuplicate(blockedMissCheckStatistics);
 
@@ -287,6 +298,18 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
             }
         }
 
+        // 航站楼+区域+通道 - 通过通道ID查询
+        if (ObjUtil.isNotNull(data.getChannelId())) {
+            BasePosition channel = basePositionService.selectBasePositionById(data.getChannelId());
+            BasePosition area = basePositionService.selectBasePositionById(channel.getParentId());
+            BasePosition terminal = basePositionService.selectBasePositionById(area.getParentId());
+            data.setChannelName(channel.getName());
+            data.setAreaId(area.getId());
+            data.setAreaName(area.getName());
+            data.setTerminalId(terminal.getId());
+            data.setTerminalName(terminal.getName());
+        }
+
         // 5. 被回查人ID - 通过用户昵称查询
         if (ObjUtil.isNull(data.getReviewedUserId()) && StrUtil.isNotBlank(data.getReviewedUserName())) {
             SysUser userQuery = new SysUser();