airport-admin/src/main/java/com/sundot/airport/web/controller/blocked/BlockedMissCheckStatisticsController.java

@@ -2,6 +2,7 @@ package com.sundot.airport.web.controller.blocked;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,14 +25,13 @@ import com.sundot.airport.common.core.page.TableDataInfo;
 
 /**
  * 漏检统计Controller
- * 
+ *
  * @author wangxx
  * @date 2026-04-13
  */
 @RestController
 @RequestMapping("/blocked/missReview")
-public class BlockedMissCheckStatisticsController extends BaseController
-{
+public class BlockedMissCheckStatisticsController extends BaseController {
     @Autowired
     private IBlockedMissCheckStatisticsService blockedMissCheckStatisticsService;
 
@@ -40,8 +40,7 @@ public class BlockedMissCheckStatisticsController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('blocked:missReview:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public TableDataInfo list(BlockedMissCheckStatistics blockedMissCheckStatistics) {
         startPage();
         List<BlockedMissCheckStatistics> list = blockedMissCheckStatisticsService.selectBlockedMissCheckStatisticsList(blockedMissCheckStatistics);
         return getDataTable(list);
@@ -53,8 +52,7 @@ public class BlockedMissCheckStatisticsController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:missReview:export')")
     @Log(title = "漏检统计", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public void export(HttpServletResponse response, BlockedMissCheckStatistics blockedMissCheckStatistics) {
         List<BlockedMissCheckStatistics> list = blockedMissCheckStatisticsService.selectBlockedMissCheckStatisticsList(blockedMissCheckStatistics);
         ExcelUtil<BlockedMissCheckStatistics> util = new ExcelUtil<BlockedMissCheckStatistics>(BlockedMissCheckStatistics.class);
         util.exportExcel(response, list, "漏检统计数据");
@@ -66,8 +64,7 @@ public class BlockedMissCheckStatisticsController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:missReview:import')")
     @Log(title = "漏检统计", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<BlockedMissCheckStatistics> util = new ExcelUtil<BlockedMissCheckStatistics>(BlockedMissCheckStatistics.class);
         List<BlockedMissCheckStatistics> list = util.importExcel(file.getInputStream());
         String message = blockedMissCheckStatisticsService.importData(list, updateSupport);
@@ -78,8 +75,7 @@ public class BlockedMissCheckStatisticsController extends BaseController
      * 获取导入模板
      */
     @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response)
-    {
+    public void importTemplate(HttpServletResponse response) {
         ExcelUtil<BlockedMissCheckStatistics> util = new ExcelUtil<BlockedMissCheckStatistics>(BlockedMissCheckStatistics.class);
         util.importTemplateExcel(response, "漏检统计数据");
     }
@@ -89,8 +85,7 @@ public class BlockedMissCheckStatisticsController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('blocked:missReview:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(blockedMissCheckStatisticsService.selectBlockedMissCheckStatisticsById(id));
     }
 
@@ -99,11 +94,9 @@ public class BlockedMissCheckStatisticsController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('blocked:missReview:add')")
     @GetMapping("/checkDuplicate")
-    public AjaxResult checkDuplicate(BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public AjaxResult checkDuplicate(BlockedMissCheckStatistics blockedMissCheckStatistics) {
         BlockedMissCheckStatistics duplicate = blockedMissCheckStatisticsService.checkDuplicate(blockedMissCheckStatistics);
-        if (duplicate != null)
-        {
+        if (duplicate != null) {
             return AjaxResult.warn("数据已存在（被回查人：" + duplicate.getReviewedUserName() + "，回查日期：" + duplicate.getReviewDate() + "，漏检时间：" + duplicate.getMissCheckTime() + "），是否覆盖？", duplicate);
         }
         return success();
@@ -115,8 +108,7 @@ public class BlockedMissCheckStatisticsController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:missReview:add')")
     @Log(title = "漏检统计", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public AjaxResult add(@RequestBody BlockedMissCheckStatistics blockedMissCheckStatistics) {
         blockedMissCheckStatistics.setCreateBy(getUsername());
         return toAjax(blockedMissCheckStatisticsService.insertBlockedMissCheckStatistics(blockedMissCheckStatistics));
     }
@@ -127,8 +119,7 @@ public class BlockedMissCheckStatisticsController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:missReview:add')")
     @Log(title = "漏检统计", businessType = BusinessType.INSERT)
     @PostMapping("/addOrOverwrite")
-    public AjaxResult addOrOverwrite(@RequestBody BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public AjaxResult addOrOverwrite(@RequestBody BlockedMissCheckStatistics blockedMissCheckStatistics) {
         blockedMissCheckStatistics.setCreateBy(getUsername());
         blockedMissCheckStatistics.setUpdateBy(getUsername());
         return toAjax(blockedMissCheckStatisticsService.insertOrUpdate(blockedMissCheckStatistics));
@@ -140,8 +131,7 @@ public class BlockedMissCheckStatisticsController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:missReview:edit')")
     @Log(title = "漏检统计", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public AjaxResult edit(@RequestBody BlockedMissCheckStatistics blockedMissCheckStatistics) {
         blockedMissCheckStatistics.setUpdateBy(getUsername());
         return toAjax(blockedMissCheckStatisticsService.updateBlockedMissCheckStatistics(blockedMissCheckStatistics));
     }
@@ -152,8 +142,7 @@ public class BlockedMissCheckStatisticsController extends BaseController
     @PreAuthorize("@ss.hasPermi('blocked:missReview:remove')")
     @Log(title = "漏检统计", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(blockedMissCheckStatisticsService.deleteBlockedMissCheckStatisticsByIds(ids));
     }
 }

airport-admin/src/main/java/com/sundot/airport/web/controller/blocked/BlockedMissCheckStatisticsScreenController.java

@@ -0,0 +1,46 @@
+package com.sundot.airport.web.controller.blocked;
+
+import com.sundot.airport.blocked.service.IBlockedMissCheckStatisticsScreenService;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BlockedMissCheckStatisticsQueryParamDto;
+import com.sundot.airport.common.dto.BaseCommonDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 漏检统计大屏Controller
+ *
+ * @author wangxx
+ * @date 2026-04-13
+ */
+@RestController
+@RequestMapping("/blocked/missReview/screen")
+public class BlockedMissCheckStatisticsScreenController extends BaseController {
+
+    @Autowired
+    private IBlockedMissCheckStatisticsScreenService blockedMissCheckStatisticsScreenService;
+
+    /**
+     * 月考成绩统计
+     */
+    @GetMapping("/monthlyAssessment")
+    public AjaxResult monthlyAssessment(BlockedMissCheckStatisticsQueryParamDto dto) {
+        List<BaseCommonDto> list = blockedMissCheckStatisticsScreenService.monthlyAssessment(dto);
+        return success(list);
+    }
+
+    /**
+     * 本月自测有无漏检统计
+     */
+    @GetMapping("/selfTestHasMissCheck")
+    public AjaxResult selfTestHasMissCheck(BlockedMissCheckStatisticsQueryParamDto dto) {
+        List<BaseCommonDto> list = blockedMissCheckStatisticsScreenService.selfTestHasMissCheck(dto);
+        return success(list);
+    }
+
+}

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

@@ -1,6 +1,7 @@
 package com.sundot.airport.blocked.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -10,12 +11,11 @@ import com.sundot.airport.common.core.domain.BaseEntity;
 
 /**
  * 漏检统计对象 blocked_miss_check_statistics
- * 
+ *
  * @author wangxx
  * @date 2026-04-13
  */
-public class BlockedMissCheckStatistics extends BaseEntity
-{
+public class BlockedMissCheckStatistics extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 主键ID */
@@ -178,388 +178,320 @@ public class BlockedMissCheckStatistics extends BaseEntity
     @ApiModelProperty("删除标志（0代表存在 1代表删除）")
     private String delFlag;
 
-    public void setId(Long id) 
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
 
-    public void setBrigadeId(Long brigadeId) 
-    {
+    public void setBrigadeId(Long brigadeId) {
         this.brigadeId = brigadeId;
     }
 
-    public Long getBrigadeId() 
-    {
+    public Long getBrigadeId() {
         return brigadeId;
     }
 
-    public void setBrigadeName(String brigadeName) 
-    {
+    public void setBrigadeName(String brigadeName) {
         this.brigadeName = brigadeName;
     }
 
-    public String getBrigadeName() 
-    {
+    public String getBrigadeName() {
         return brigadeName;
     }
 
-    public void setTerminalId(Long terminalId) 
-    {
+    public void setTerminalId(Long terminalId) {
         this.terminalId = terminalId;
     }
 
-    public Long getTerminalId() 
-    {
+    public Long getTerminalId() {
         return terminalId;
     }
 
-    public void setTerminalName(String terminalName) 
-    {
+    public void setTerminalName(String terminalName) {
         this.terminalName = terminalName;
     }
 
-    public String getTerminalName() 
-    {
+    public String getTerminalName() {
         return terminalName;
     }
 
-    public void setAreaId(Long areaId) 
-    {
+    public void setAreaId(Long areaId) {
         this.areaId = areaId;
     }
 
-    public Long getAreaId() 
-    {
+    public Long getAreaId() {
         return areaId;
     }
 
-    public void setAreaName(String areaName) 
-    {
+    public void setAreaName(String areaName) {
         this.areaName = areaName;
     }
 
-    public String getAreaName() 
-    {
+    public String getAreaName() {
         return areaName;
     }
 
-    public void setChannelId(Long channelId) 
-    {
+    public void setChannelId(Long channelId) {
         this.channelId = channelId;
     }
 
-    public Long getChannelId() 
-    {
+    public Long getChannelId() {
         return channelId;
     }
 
-    public void setChannelName(String channelName) 
-    {
+    public void setChannelName(String channelName) {
         this.channelName = channelName;
     }
 
-    public String getChannelName() 
-    {
+    public String getChannelName() {
         return channelName;
     }
 
-    public void setReviewedUserId(Long reviewedUserId) 
-    {
+    public void setReviewedUserId(Long reviewedUserId) {
         this.reviewedUserId = reviewedUserId;
     }
 
-    public Long getReviewedUserId() 
-    {
+    public Long getReviewedUserId() {
         return reviewedUserId;
     }
 
-    public void setReviewedUserName(String reviewedUserName) 
-    {
+    public void setReviewedUserName(String reviewedUserName) {
         this.reviewedUserName = reviewedUserName;
     }
 
-    public String getReviewedUserName() 
-    {
+    public String getReviewedUserName() {
         return reviewedUserName;
     }
 
-    public void setReviewUserId(Long reviewUserId) 
-    {
+    public void setReviewUserId(Long reviewUserId) {
         this.reviewUserId = reviewUserId;
     }
 
-    public Long getReviewUserId() 
-    {
+    public Long getReviewUserId() {
         return reviewUserId;
     }
 
-    public void setReviewUserName(String reviewUserName) 
-    {
+    public void setReviewUserName(String reviewUserName) {
         this.reviewUserName = reviewUserName;
     }
 
-    public String getReviewUserName() 
-    {
+    public String getReviewUserName() {
         return reviewUserName;
     }
 
-    public void setSupervisorId(Long supervisorId) 
-    {
+    public void setSupervisorId(Long supervisorId) {
         this.supervisorId = supervisorId;
     }
 
-    public Long getSupervisorId() 
-    {
+    public Long getSupervisorId() {
         return supervisorId;
     }
 
-    public void setSupervisorName(String supervisorName) 
-    {
+    public void setSupervisorName(String supervisorName) {
         this.supervisorName = supervisorName;
     }
 
-    public String getSupervisorName() 
-    {
+    public String getSupervisorName() {
         return supervisorName;
     }
 
-    public void setActingSupervisorId(Long actingSupervisorId) 
-    {
+    public void setActingSupervisorId(Long actingSupervisorId) {
         this.actingSupervisorId = actingSupervisorId;
     }
 
-    public Long getActingSupervisorId() 
-    {
+    public Long getActingSupervisorId() {
         return actingSupervisorId;
     }
 
-    public void setActingSupervisorName(String actingSupervisorName) 
-    {
+    public void setActingSupervisorName(String actingSupervisorName) {
         this.actingSupervisorName = actingSupervisorName;
     }
 
-    public String getActingSupervisorName() 
-    {
+    public String getActingSupervisorName() {
         return actingSupervisorName;
     }
 
-    public void setTeamLeaderId(Long teamLeaderId) 
-    {
+    public void setTeamLeaderId(Long teamLeaderId) {
         this.teamLeaderId = teamLeaderId;
     }
 
-    public Long getTeamLeaderId() 
-    {
+    public Long getTeamLeaderId() {
         return teamLeaderId;
     }
 
-    public void setTeamLeaderName(String teamLeaderName) 
-    {
+    public void setTeamLeaderName(String teamLeaderName) {
         this.teamLeaderName = teamLeaderName;
     }
 
-    public String getTeamLeaderName() 
-    {
+    public String getTeamLeaderName() {
         return teamLeaderName;
     }
 
-    public void setReviewDate(Date reviewDate) 
-    {
+    public void setReviewDate(Date reviewDate) {
         this.reviewDate = reviewDate;
     }
 
-    public Date getReviewDate() 
-    {
+    public Date getReviewDate() {
         return reviewDate;
     }
 
-    public void setMissCheckTime(Date missCheckTime) 
-    {
+    public void setMissCheckTime(Date missCheckTime) {
         this.missCheckTime = missCheckTime;
     }
 
-    public Date getMissCheckTime() 
-    {
+    public Date getMissCheckTime() {
         return missCheckTime;
     }
 
-    public void setMissCheckTimePeriod(String missCheckTimePeriod) 
-    {
+    public void setMissCheckTimePeriod(String missCheckTimePeriod) {
         this.missCheckTimePeriod = missCheckTimePeriod;
     }
 
-    public String getMissCheckTimePeriod() 
-    {
+    public String getMissCheckTimePeriod() {
         return missCheckTimePeriod;
     }
 
-    public void setMissCheckItem(String missCheckItem) 
-    {
+    public void setMissCheckItem(String missCheckItem) {
         this.missCheckItem = missCheckItem;
     }
 
-    public String getMissCheckItem() 
-    {
+    public String getMissCheckItem() {
         return missCheckItem;
     }
 
-    public void setItemLocation(String itemLocation) 
-    {
+    public void setItemLocation(String itemLocation) {
         this.itemLocation = itemLocation;
     }
 
-    public String getItemLocation() 
-    {
+    public String getItemLocation() {
         return itemLocation;
     }
 
-    public void setDifficultyLevel(String difficultyLevel) 
-    {
+    public void setDifficultyLevel(String difficultyLevel) {
         this.difficultyLevel = difficultyLevel;
     }
 
-    public String getDifficultyLevel() 
-    {
+    public String getDifficultyLevel() {
         return difficultyLevel;
     }
 
-    public void setDiscriminationType(String discriminationType) 
-    {
+    public void setDiscriminationType(String discriminationType) {
         this.discriminationType = discriminationType;
     }
 
-    public String getDiscriminationType() 
-    {
+    public String getDiscriminationType() {
         return discriminationType;
     }
 
-    public void setIsRecovered(Integer isRecovered) 
-    {
+    public void setIsRecovered(Integer isRecovered) {
         this.isRecovered = isRecovered;
     }
 
-    public Integer getIsRecovered() 
-    {
+    public Integer getIsRecovered() {
         return isRecovered;
     }
 
-    public void setMachineOperatingYears(Integer machineOperatingYears) 
-    {
+    public void setMachineOperatingYears(Integer machineOperatingYears) {
         this.machineOperatingYears = machineOperatingYears;
     }
 
-    public Integer getMachineOperatingYears() 
-    {
+    public Integer getMachineOperatingYears() {
         return machineOperatingYears;
     }
 
-    public void setCertificateLevel(String certificateLevel) 
-    {
+    public void setCertificateLevel(String certificateLevel) {
         this.certificateLevel = certificateLevel;
     }
 
-    public String getCertificateLevel() 
-    {
+    public String getCertificateLevel() {
         return certificateLevel;
     }
 
-    public void setGender(String gender) 
-    {
+    public void setGender(String gender) {
         this.gender = gender;
     }
 
-    public String getGender() 
-    {
+    public String getGender() {
         return gender;
     }
 
-    public void setMissCheckReasonCategory(String missCheckReasonCategory) 
-    {
+    public void setMissCheckReasonCategory(String missCheckReasonCategory) {
         this.missCheckReasonCategory = missCheckReasonCategory;
     }
 
-    public String getMissCheckReasonCategory() 
-    {
+    public String getMissCheckReasonCategory() {
         return missCheckReasonCategory;
     }
 
-    public void setMonthlyAssessment(String monthlyAssessment) 
-    {
+    public void setMonthlyAssessment(String monthlyAssessment) {
         this.monthlyAssessment = monthlyAssessment;
     }
 
-    public String getMonthlyAssessment() 
-    {
+    public String getMonthlyAssessment() {
         return monthlyAssessment;
     }
 
-    public void setSelfTestHasMissCheck(Integer selfTestHasMissCheck) 
-    {
+    public void setSelfTestHasMissCheck(Integer selfTestHasMissCheck) {
         this.selfTestHasMissCheck = selfTestHasMissCheck;
     }
 
-    public Integer getSelfTestHasMissCheck() 
-    {
+    public Integer getSelfTestHasMissCheck() {
         return selfTestHasMissCheck;
     }
 
-    public void setDelFlag(String delFlag) 
-    {
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
-    {
+    public String getDelFlag() {
         return delFlag;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("brigadeId", getBrigadeId())
-            .append("brigadeName", getBrigadeName())
-            .append("terminalId", getTerminalId())
-            .append("terminalName", getTerminalName())
-            .append("areaId", getAreaId())
-            .append("areaName", getAreaName())
-            .append("channelId", getChannelId())
-            .append("channelName", getChannelName())
-            .append("reviewedUserId", getReviewedUserId())
-            .append("reviewedUserName", getReviewedUserName())
-            .append("reviewUserId", getReviewUserId())
-            .append("reviewUserName", getReviewUserName())
-            .append("supervisorId", getSupervisorId())
-            .append("supervisorName", getSupervisorName())
-            .append("actingSupervisorId", getActingSupervisorId())
-            .append("actingSupervisorName", getActingSupervisorName())
-            .append("teamLeaderId", getTeamLeaderId())
-            .append("teamLeaderName", getTeamLeaderName())
-            .append("reviewDate", getReviewDate())
-            .append("missCheckTime", getMissCheckTime())
-            .append("missCheckTimePeriod", getMissCheckTimePeriod())
-            .append("missCheckItem", getMissCheckItem())
-            .append("itemLocation", getItemLocation())
-            .append("difficultyLevel", getDifficultyLevel())
-            .append("discriminationType", getDiscriminationType())
-            .append("isRecovered", getIsRecovered())
-            .append("machineOperatingYears", getMachineOperatingYears())
-            .append("certificateLevel", getCertificateLevel())
-            .append("gender", getGender())
-            .append("missCheckReasonCategory", getMissCheckReasonCategory())
-            .append("monthlyAssessment", getMonthlyAssessment())
-            .append("selfTestHasMissCheck", getSelfTestHasMissCheck())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+                .append("id", getId())
+                .append("brigadeId", getBrigadeId())
+                .append("brigadeName", getBrigadeName())
+                .append("terminalId", getTerminalId())
+                .append("terminalName", getTerminalName())
+                .append("areaId", getAreaId())
+                .append("areaName", getAreaName())
+                .append("channelId", getChannelId())
+                .append("channelName", getChannelName())
+                .append("reviewedUserId", getReviewedUserId())
+                .append("reviewedUserName", getReviewedUserName())
+                .append("reviewUserId", getReviewUserId())
+                .append("reviewUserName", getReviewUserName())
+                .append("supervisorId", getSupervisorId())
+                .append("supervisorName", getSupervisorName())
+                .append("actingSupervisorId", getActingSupervisorId())
+                .append("actingSupervisorName", getActingSupervisorName())
+                .append("teamLeaderId", getTeamLeaderId())
+                .append("teamLeaderName", getTeamLeaderName())
+                .append("reviewDate", getReviewDate())
+                .append("missCheckTime", getMissCheckTime())
+                .append("missCheckTimePeriod", getMissCheckTimePeriod())
+                .append("missCheckItem", getMissCheckItem())
+                .append("itemLocation", getItemLocation())
+                .append("difficultyLevel", getDifficultyLevel())
+                .append("discriminationType", getDiscriminationType())
+                .append("isRecovered", getIsRecovered())
+                .append("machineOperatingYears", getMachineOperatingYears())
+                .append("certificateLevel", getCertificateLevel())
+                .append("gender", getGender())
+                .append("missCheckReasonCategory", getMissCheckReasonCategory())
+                .append("monthlyAssessment", getMonthlyAssessment())
+                .append("selfTestHasMissCheck", getSelfTestHasMissCheck())
+                .append("delFlag", getDelFlag())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

airport-blocked/src/main/java/com/sundot/airport/blocked/mapper/BlockedMissCheckStatisticsMapper.java

@@ -1,19 +1,19 @@
 package com.sundot.airport.blocked.mapper;
 
 import java.util.List;
+
 import com.sundot.airport.blocked.domain.BlockedMissCheckStatistics;
 
 /**
  * 漏检统计Mapper接口
- * 
+ *
  * @author wangxx
  * @date 2026-04-13
  */
-public interface BlockedMissCheckStatisticsMapper 
-{
+public interface BlockedMissCheckStatisticsMapper {
     /**
      * 查询漏检统计
-     * 
+     *
      * @param id 漏检统计主键
      * @return 漏检统计
      */
@@ -21,7 +21,7 @@ public interface BlockedMissCheckStatisticsMapper
 
     /**
      * 查询漏检统计列表
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 漏检统计集合
      */
@@ -29,7 +29,7 @@ public interface BlockedMissCheckStatisticsMapper
 
     /**
      * 新增漏检统计
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface BlockedMissCheckStatisticsMapper
 
     /**
      * 修改漏检统计
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface BlockedMissCheckStatisticsMapper
 
     /**
      * 删除漏检统计
-     * 
+     *
      * @param id 漏检统计主键
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface BlockedMissCheckStatisticsMapper
 
     /**
      * 批量删除漏检统计
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

airport-blocked/src/main/java/com/sundot/airport/blocked/service/IBlockedMissCheckStatisticsScreenService.java

@@ -0,0 +1,32 @@
+package com.sundot.airport.blocked.service;
+
+import com.sundot.airport.common.core.domain.BlockedMissCheckStatisticsQueryParamDto;
+import com.sundot.airport.common.dto.BaseCommonDto;
+
+import java.util.List;
+
+/**
+ * 漏检统计大屏Service接口
+ *
+ * @author wangxx
+ * @date 2026-04-13
+ */
+public interface IBlockedMissCheckStatisticsScreenService {
+
+    /**
+     * 月考成绩统计
+     *
+     * @param dto 漏检统计查询参数
+     * @return 月考成绩统计
+     */
+    public List<BaseCommonDto> monthlyAssessment(BlockedMissCheckStatisticsQueryParamDto dto);
+
+    /**
+     * 本月自测有无漏检统计
+     *
+     * @param dto 漏检统计查询参数
+     * @return 本月自测有无漏检统计
+     */
+    public List<BaseCommonDto> selfTestHasMissCheck(BlockedMissCheckStatisticsQueryParamDto dto);
+
+}

airport-blocked/src/main/java/com/sundot/airport/blocked/service/IBlockedMissCheckStatisticsService.java

@@ -1,19 +1,19 @@
 package com.sundot.airport.blocked.service;
 
 import java.util.List;
+
 import com.sundot.airport.blocked.domain.BlockedMissCheckStatistics;
 
 /**
  * 漏检统计Service接口
- * 
+ *
  * @author wangxx
  * @date 2026-04-13
  */
-public interface IBlockedMissCheckStatisticsService 
-{
+public interface IBlockedMissCheckStatisticsService {
     /**
      * 查询漏检统计
-     * 
+     *
      * @param id 漏检统计主键
      * @return 漏检统计
      */
@@ -21,7 +21,7 @@ public interface IBlockedMissCheckStatisticsService
 
     /**
      * 查询漏检统计列表
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 漏检统计集合
      */
@@ -29,7 +29,7 @@ public interface IBlockedMissCheckStatisticsService
 
     /**
      * 新增漏检统计
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IBlockedMissCheckStatisticsService
 
     /**
      * 修改漏检统计
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IBlockedMissCheckStatisticsService
 
     /**
      * 批量删除漏检统计
-     * 
+     *
      * @param ids 需要删除的漏检统计主键集合
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface IBlockedMissCheckStatisticsService
 
     /**
      * 删除漏检统计信息
-     * 
+     *
      * @param id 漏检统计主键
      * @return 结果
      */
@@ -61,7 +61,7 @@ public interface IBlockedMissCheckStatisticsService
 
     /**
      * 导入漏检统计数据
-     * 
+     *
      * @param list 数据列表
      * @param updateSupport 是否更新支持
      * @return 导入结果信息
@@ -70,7 +70,7 @@ public interface IBlockedMissCheckStatisticsService
 
     /**
      * 检查数据是否重复（被回查人+回查日期+漏检时间）
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计数据
      * @return 重复的数据，如果没有重复返回null
      */
@@ -78,7 +78,7 @@ public interface IBlockedMissCheckStatisticsService
 
     /**
      * 新增或更新漏检统计（如果数据重复则覆盖更新）
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 结果
      */

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

@@ -0,0 +1,89 @@
+package com.sundot.airport.blocked.service.impl;
+
+import com.sundot.airport.blocked.domain.BlockedMissCheckStatistics;
+import com.sundot.airport.blocked.mapper.BlockedMissCheckStatisticsMapper;
+import com.sundot.airport.blocked.service.IBlockedMissCheckStatisticsScreenService;
+import com.sundot.airport.common.core.domain.BlockedMissCheckStatisticsQueryParamDto;
+import com.sundot.airport.common.core.domain.entity.SysDictData;
+import com.sundot.airport.common.dto.BaseCommonDto;
+import com.sundot.airport.system.service.ISysDictDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 漏检统计大屏Service业务层处理
+ *
+ * @author wangxx
+ * @date 2026-04-13
+ */
+@Service
+public class BlockedMissCheckStatisticsScreenServiceImpl implements IBlockedMissCheckStatisticsScreenService {
+
+    @Autowired
+    private BlockedMissCheckStatisticsMapper blockedMissCheckStatisticsMapper;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
+    /**
+     * 月考成绩统计
+     *
+     * @param dto 漏检统计查询参数
+     * @return 月考成绩统计
+     */
+    @Override
+    public List<BaseCommonDto> monthlyAssessment(BlockedMissCheckStatisticsQueryParamDto dto) {
+        List<BaseCommonDto> result = new ArrayList<>();
+        SysDictData dictData = new SysDictData();
+        dictData.setDictType("blocked_monthly_exam_result");
+        List<SysDictData> sysDictDataList = sysDictDataService.selectDictDataList(dictData);
+        BlockedMissCheckStatistics query = new BlockedMissCheckStatistics();
+        query.setReviewDate(dto.getSpecifiedDate());
+        query.setBrigadeId(dto.getBrigadeId());
+        query.setBrigadeName(dto.getBrigadeName());
+        List<BlockedMissCheckStatistics> blockedMissCheckStatisticsList = blockedMissCheckStatisticsMapper.selectBlockedMissCheckStatisticsList(query);
+        Map<String, Long> monthlyAssessmentMap = blockedMissCheckStatisticsList.stream()
+                .filter(blockedMissCheckStatistics -> blockedMissCheckStatistics.getMonthlyAssessment() != null)
+                .collect(Collectors.groupingBy(BlockedMissCheckStatistics::getMonthlyAssessment, Collectors.counting()));
+        sysDictDataList.forEach(sysDictData -> {
+            BaseCommonDto item = new BaseCommonDto();
+            item.setCode(sysDictData.getDictValue());
+            item.setName(sysDictData.getDictLabel());
+            item.setTotal(BigDecimal.valueOf(monthlyAssessmentMap.getOrDefault(sysDictData.getDictValue(), 0L)));
+            result.add(item);
+        });
+        return result;
+    }
+
+    /**
+     * 本月自测有无漏检统计
+     *
+     * @param dto 漏检统计查询参数
+     * @return 本月自测有无漏检统计
+     */
+    @Override
+    public List<BaseCommonDto> selfTestHasMissCheck(BlockedMissCheckStatisticsQueryParamDto dto) {
+        List<BaseCommonDto> result = new ArrayList<>();
+        BlockedMissCheckStatistics query = new BlockedMissCheckStatistics();
+        query.setReviewDate(dto.getSpecifiedDate());
+        query.setBrigadeId(dto.getBrigadeId());
+        query.setBrigadeName(dto.getBrigadeName());
+        List<BlockedMissCheckStatistics> blockedMissCheckStatisticsList = blockedMissCheckStatisticsMapper.selectBlockedMissCheckStatisticsList(query);
+        Map<Integer, Long> selfTestHasMissCheckMap = blockedMissCheckStatisticsList.stream()
+                .filter(blockedMissCheckStatistics -> blockedMissCheckStatistics.getSelfTestHasMissCheck() != null)
+                .collect(Collectors.groupingBy(BlockedMissCheckStatistics::getSelfTestHasMissCheck, Collectors.counting()));
+        selfTestHasMissCheckMap.forEach((key, value) -> {
+            BaseCommonDto item = new BaseCommonDto();
+            item.setName(String.valueOf(key));
+            item.setTotal(BigDecimal.valueOf(value));
+            result.add(item);
+        });
+        return result;
+    }
+
+}

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

@@ -2,6 +2,7 @@ package com.sundot.airport.blocked.service.impl;
 
 import java.util.Date;
 import java.util.List;
+
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
@@ -22,13 +23,12 @@ import com.sundot.airport.system.service.ISysDeptService;
 
 /**
  * 漏检统计Service业务层处理
- * 
+ *
  * @author wangxx
  * @date 2026-04-13
  */
 @Service
-public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckStatisticsService 
-{
+public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckStatisticsService {
     @Autowired
     private BlockedMissCheckStatisticsMapper blockedMissCheckStatisticsMapper;
 
@@ -43,37 +43,34 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
 
     /**
      * 查询漏检统计
-     * 
+     *
      * @param id 漏检统计主键
      * @return 漏检统计
      */
     @Override
-    public BlockedMissCheckStatistics selectBlockedMissCheckStatisticsById(Long id)
-    {
+    public BlockedMissCheckStatistics selectBlockedMissCheckStatisticsById(Long id) {
         return blockedMissCheckStatisticsMapper.selectBlockedMissCheckStatisticsById(id);
     }
 
     /**
      * 查询漏检统计列表
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 漏检统计
      */
     @Override
-    public List<BlockedMissCheckStatistics> selectBlockedMissCheckStatisticsList(BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public List<BlockedMissCheckStatistics> selectBlockedMissCheckStatisticsList(BlockedMissCheckStatistics blockedMissCheckStatistics) {
         return blockedMissCheckStatisticsMapper.selectBlockedMissCheckStatisticsList(blockedMissCheckStatistics);
     }
 
     /**
      * 新增漏检统计
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 结果
      */
     @Override
-    public int insertBlockedMissCheckStatistics(BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public int insertBlockedMissCheckStatistics(BlockedMissCheckStatistics blockedMissCheckStatistics) {
         // 根据名称填充ID
         fillIdsByName(blockedMissCheckStatistics);
         blockedMissCheckStatistics.setCreateTime(DateUtils.getNowDate());
@@ -82,13 +79,12 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
 
     /**
      * 修改漏检统计
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 结果
      */
     @Override
-    public int updateBlockedMissCheckStatistics(BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public int updateBlockedMissCheckStatistics(BlockedMissCheckStatistics blockedMissCheckStatistics) {
         // 根据名称填充ID
         fillIdsByName(blockedMissCheckStatistics);
         blockedMissCheckStatistics.setUpdateTime(DateUtils.getNowDate());
@@ -97,41 +93,37 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
 
     /**
      * 批量删除漏检统计
-     * 
+     *
      * @param ids 需要删除的漏检统计主键
      * @return 结果
      */
     @Override
-    public int deleteBlockedMissCheckStatisticsByIds(Long[] ids)
-    {
+    public int deleteBlockedMissCheckStatisticsByIds(Long[] ids) {
         return blockedMissCheckStatisticsMapper.deleteBlockedMissCheckStatisticsByIds(ids);
     }
 
     /**
      * 删除漏检统计信息
-     * 
+     *
      * @param id 漏检统计主键
      * @return 结果
      */
     @Override
-    public int deleteBlockedMissCheckStatisticsById(Long id)
-    {
+    public int deleteBlockedMissCheckStatisticsById(Long id) {
         return blockedMissCheckStatisticsMapper.deleteBlockedMissCheckStatisticsById(id);
     }
 
     /**
      * 导入漏检统计数据
-     * 
+     *
      * @param list 数据列表
      * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
      * @return 结果
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public String importData(List<BlockedMissCheckStatistics> list, boolean isUpdateSupport)
-    {
-        if (CollUtil.isEmpty(list))
-        {
+    public String importData(List<BlockedMissCheckStatistics> list, boolean isUpdateSupport) {
+        if (CollUtil.isEmpty(list)) {
             throw new ServiceException("导入漏检统计数据不能为空！");
         }
 
@@ -139,42 +131,35 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
-        
-        for (BlockedMissCheckStatistics data : list)
-        {
-            try
-            {
-                if (ObjUtil.isNull(data.getReviewDate()))
-                {
+
+        for (BlockedMissCheckStatistics data : list) {
+            try {
+                if (ObjUtil.isNull(data.getReviewDate())) {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、回查日期不能为空");
                     continue;
                 }
-                if (ObjUtil.isNull(data.getMissCheckTime()))
-                {
+                if (ObjUtil.isNull(data.getMissCheckTime())) {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、漏检时间不能为空");
                     continue;
                 }
-                
+
                 // 查询是否已存在（根据被回查人+回查日期+漏检时间唯一）
                 BlockedMissCheckStatistics queryParam = new BlockedMissCheckStatistics();
                 queryParam.setReviewedUserId(data.getReviewedUserId());
                 queryParam.setReviewDate(data.getReviewDate());
                 queryParam.setMissCheckTime(data.getMissCheckTime());
                 List<BlockedMissCheckStatistics> existingList = blockedMissCheckStatisticsMapper.selectBlockedMissCheckStatisticsList(queryParam);
-                
-                if (CollUtil.isEmpty(existingList))
-                {
+
+                if (CollUtil.isEmpty(existingList)) {
                     // 新增
                     fillIdsByName(data);
                     data.setCreateTime(DateUtils.getNowDate());
                     blockedMissCheckStatisticsMapper.insertBlockedMissCheckStatistics(data);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】导入成功");
-                }
-                else if (isUpdateSupport)
-                {
+                } else if (isUpdateSupport) {
                     // 更新
                     BlockedMissCheckStatistics old = existingList.get(0);
                     data.setId(old.getId());
@@ -183,28 +168,21 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
                     blockedMissCheckStatisticsMapper.updateBlockedMissCheckStatistics(data);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】更新成功");
-                }
-                else
-                {
+                } else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】已存在");
                 }
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 failureNum++;
                 String msg = "<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】导入失败：";
                 failureMsg.append(msg + e.getMessage());
             }
         }
-        
-        if (failureNum > 0)
-        {
+
+        if (failureNum > 0) {
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
-        }
-        else
-        {
+        } else {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
         }
         return successMsg.toString();
@@ -212,28 +190,25 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
 
     /**
      * 检查数据是否重复（被回查人+回查日期+漏检时间）
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计数据
      * @return 重复的数据，如果没有重复返回null
      */
     @Override
-    public BlockedMissCheckStatistics checkDuplicate(BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public BlockedMissCheckStatistics checkDuplicate(BlockedMissCheckStatistics blockedMissCheckStatistics) {
         if (ObjUtil.isNull(blockedMissCheckStatistics.getReviewedUserId())
                 || ObjUtil.isNull(blockedMissCheckStatistics.getReviewDate())
-                || ObjUtil.isNull(blockedMissCheckStatistics.getMissCheckTime()))
-        {
+                || ObjUtil.isNull(blockedMissCheckStatistics.getMissCheckTime())) {
             return null;
         }
-        
+
         BlockedMissCheckStatistics queryParam = new BlockedMissCheckStatistics();
         queryParam.setReviewedUserId(blockedMissCheckStatistics.getReviewedUserId());
         queryParam.setReviewDate(blockedMissCheckStatistics.getReviewDate());
         queryParam.setMissCheckTime(blockedMissCheckStatistics.getMissCheckTime());
         List<BlockedMissCheckStatistics> existingList = blockedMissCheckStatisticsMapper.selectBlockedMissCheckStatisticsList(queryParam);
-        
-        if (CollUtil.isNotEmpty(existingList))
-        {
+
+        if (CollUtil.isNotEmpty(existingList)) {
             return existingList.get(0);
         }
         return null;
@@ -241,28 +216,24 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
 
     /**
      * 新增或更新漏检统计（如果数据重复则覆盖更新）
-     * 
+     *
      * @param blockedMissCheckStatistics 漏检统计
      * @return 结果
      */
     @Override
     @Transactional
-    public int insertOrUpdate(BlockedMissCheckStatistics blockedMissCheckStatistics)
-    {
+    public int insertOrUpdate(BlockedMissCheckStatistics blockedMissCheckStatistics) {
         // 检查是否重复
         BlockedMissCheckStatistics existing = checkDuplicate(blockedMissCheckStatistics);
-        
-        if (existing != null)
-        {
+
+        if (existing != null) {
             // 数据已存在，执行更新（覆盖）
             blockedMissCheckStatistics.setId(existing.getId());
-            blockedMissCheckStatistics.setUpdateBy(blockedMissCheckStatistics.getUpdateBy() != null 
+            blockedMissCheckStatistics.setUpdateBy(blockedMissCheckStatistics.getUpdateBy() != null
                     ? blockedMissCheckStatistics.getUpdateBy() : blockedMissCheckStatistics.getCreateBy());
             blockedMissCheckStatistics.setUpdateTime(DateUtils.getNowDate());
             return blockedMissCheckStatisticsMapper.updateBlockedMissCheckStatistics(blockedMissCheckStatistics);
-        }
-        else
-        {
+        } else {
             // 数据不存在，执行新增
             blockedMissCheckStatistics.setCreateTime(DateUtils.getNowDate());
             return blockedMissCheckStatisticsMapper.insertBlockedMissCheckStatistics(blockedMissCheckStatistics);
@@ -271,118 +242,99 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
 
     /**
      * 根据名称填充ID字段
-     * 
+     *
      * @param data 漏检统计数据
      */
-    private void fillIdsByName(BlockedMissCheckStatistics data)
-    {
+    private void fillIdsByName(BlockedMissCheckStatistics data) {
         // 1. 大队ID - 通过部门表查询
-        if (ObjUtil.isNull(data.getBrigadeId()) && StrUtil.isNotBlank(data.getBrigadeName()))
-        {
+        if (ObjUtil.isNull(data.getBrigadeId()) && StrUtil.isNotBlank(data.getBrigadeName())) {
             SysDept deptQuery = new SysDept();
             deptQuery.setDeptName(data.getBrigadeName());
             List<SysDept> deptList = sysDeptService.selectDeptList(deptQuery);
-            if (CollUtil.isNotEmpty(deptList))
-            {
+            if (CollUtil.isNotEmpty(deptList)) {
                 data.setBrigadeId(deptList.get(0).getDeptId());
             }
         }
 
         // 2. 航站楼ID - 通过位置表查询(level=1)
-        if (ObjUtil.isNull(data.getTerminalId()) && StrUtil.isNotBlank(data.getTerminalName()))
-        {
+        if (ObjUtil.isNull(data.getTerminalId()) && StrUtil.isNotBlank(data.getTerminalName())) {
             BasePosition positionQuery = new BasePosition();
             positionQuery.setName(data.getTerminalName());
             positionQuery.setLevel(1);
             List<BasePosition> positionList = basePositionService.selectBasePositionList(positionQuery);
-            if (CollUtil.isNotEmpty(positionList))
-            {
+            if (CollUtil.isNotEmpty(positionList)) {
                 data.setTerminalId(positionList.get(0).getId());
             }
         }
 
         // 3. 区域ID - 通过位置表查询(level=2)
-        if (ObjUtil.isNull(data.getAreaId()) && StrUtil.isNotBlank(data.getAreaName()))
-        {
+        if (ObjUtil.isNull(data.getAreaId()) && StrUtil.isNotBlank(data.getAreaName())) {
             BasePosition positionQuery = new BasePosition();
             positionQuery.setName(data.getAreaName());
             positionQuery.setLevel(2);
             List<BasePosition> positionList = basePositionService.selectBasePositionList(positionQuery);
-            if (CollUtil.isNotEmpty(positionList))
-            {
+            if (CollUtil.isNotEmpty(positionList)) {
                 data.setAreaId(positionList.get(0).getId());
             }
         }
 
         // 4. 上岗位置ID - 通过位置表查询(level=3)
-        if (ObjUtil.isNull(data.getChannelId()) && StrUtil.isNotBlank(data.getChannelName()))
-        {
+        if (ObjUtil.isNull(data.getChannelId()) && StrUtil.isNotBlank(data.getChannelName())) {
             BasePosition positionQuery = new BasePosition();
             positionQuery.setName(data.getChannelName());
             positionQuery.setLevel(3);
             List<BasePosition> positionList = basePositionService.selectBasePositionList(positionQuery);
-            if (CollUtil.isNotEmpty(positionList))
-            {
+            if (CollUtil.isNotEmpty(positionList)) {
                 data.setChannelId(positionList.get(0).getId());
             }
         }
 
         // 5. 被回查人ID - 通过用户昵称查询
-        if (ObjUtil.isNull(data.getReviewedUserId()) && StrUtil.isNotBlank(data.getReviewedUserName()))
-        {
+        if (ObjUtil.isNull(data.getReviewedUserId()) && StrUtil.isNotBlank(data.getReviewedUserName())) {
             SysUser userQuery = new SysUser();
             userQuery.setNickName(data.getReviewedUserName());
             List<SysUser> userList = sysUserService.selectUserList(userQuery);
-            if (CollUtil.isNotEmpty(userList))
-            {
+            if (CollUtil.isNotEmpty(userList)) {
                 data.setReviewedUserId(userList.get(0).getUserId());
             }
         }
 
         // 6. 回查人ID - 通过用户昵称查询
-        if (ObjUtil.isNull(data.getReviewUserId()) && StrUtil.isNotBlank(data.getReviewUserName()))
-        {
+        if (ObjUtil.isNull(data.getReviewUserId()) && StrUtil.isNotBlank(data.getReviewUserName())) {
             SysUser userQuery = new SysUser();
             userQuery.setNickName(data.getReviewUserName());
             List<SysUser> userList = sysUserService.selectUserList(userQuery);
-            if (CollUtil.isNotEmpty(userList))
-            {
+            if (CollUtil.isNotEmpty(userList)) {
                 data.setReviewUserId(userList.get(0).getUserId());
             }
         }
 
         // 7. 分管主管ID - 通过用户昵称查询
-        if (ObjUtil.isNull(data.getSupervisorId()) && StrUtil.isNotBlank(data.getSupervisorName()))
-        {
+        if (ObjUtil.isNull(data.getSupervisorId()) && StrUtil.isNotBlank(data.getSupervisorName())) {
             SysUser userQuery = new SysUser();
             userQuery.setNickName(data.getSupervisorName());
             List<SysUser> userList = sysUserService.selectUserList(userQuery);
-            if (CollUtil.isNotEmpty(userList))
-            {
+            if (CollUtil.isNotEmpty(userList)) {
                 data.setSupervisorId(userList.get(0).getUserId());
             }
         }
 
         // 8. 代管主管ID - 通过用户昵称查询
-        if (ObjUtil.isNull(data.getActingSupervisorId()) && StrUtil.isNotBlank(data.getActingSupervisorName()))
-        {
+        if (ObjUtil.isNull(data.getActingSupervisorId()) && StrUtil.isNotBlank(data.getActingSupervisorName())) {
             SysUser userQuery = new SysUser();
             userQuery.setNickName(data.getActingSupervisorName());
             List<SysUser> userList = sysUserService.selectUserList(userQuery);
-            if (CollUtil.isNotEmpty(userList))
-            {
+            if (CollUtil.isNotEmpty(userList)) {
                 data.setActingSupervisorId(userList.get(0).getUserId());
             }
         }
 
         // 9. 分管班组长ID - 通过用户昵称查询
-        if (ObjUtil.isNull(data.getTeamLeaderId()) && StrUtil.isNotBlank(data.getTeamLeaderName()))
-        {
+        if (ObjUtil.isNull(data.getTeamLeaderId()) && StrUtil.isNotBlank(data.getTeamLeaderName())) {
             SysUser userQuery = new SysUser();
             userQuery.setNickName(data.getTeamLeaderName());
             List<SysUser> userList = sysUserService.selectUserList(userQuery);
-            if (CollUtil.isNotEmpty(userList))
-            {
+            if (CollUtil.isNotEmpty(userList)) {
                 data.setTeamLeaderId(userList.get(0).getUserId());
             }
         }

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

@@ -1,90 +1,128 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundot.airport.blocked.mapper.BlockedMissCheckStatisticsMapper">
-    
+
     <resultMap type="BlockedMissCheckStatistics" id="BlockedMissCheckStatisticsResult">
-        <result property="id"    column="id"    />
-        <result property="brigadeId"    column="brigade_id"    />
-        <result property="brigadeName"    column="brigade_name"    />
-        <result property="terminalId"    column="terminal_id"    />
-        <result property="terminalName"    column="terminal_name"    />
-        <result property="areaId"    column="area_id"    />
-        <result property="areaName"    column="area_name"    />
-        <result property="channelId"    column="channel_id"    />
-        <result property="channelName"    column="channel_name"    />
-        <result property="reviewedUserId"    column="reviewed_user_id"    />
-        <result property="reviewedUserName"    column="reviewed_user_name"    />
-        <result property="reviewUserId"    column="review_user_id"    />
-        <result property="reviewUserName"    column="review_user_name"    />
-        <result property="supervisorId"    column="supervisor_id"    />
-        <result property="supervisorName"    column="supervisor_name"    />
-        <result property="actingSupervisorId"    column="acting_supervisor_id"    />
-        <result property="actingSupervisorName"    column="acting_supervisor_name"    />
-        <result property="teamLeaderId"    column="team_leader_id"    />
-        <result property="teamLeaderName"    column="team_leader_name"    />
-        <result property="reviewDate"    column="review_date"    />
-        <result property="missCheckTime"    column="miss_check_time"    />
-        <result property="missCheckTimePeriod"    column="miss_check_time_period"    />
-        <result property="missCheckItem"    column="miss_check_item"    />
-        <result property="itemLocation"    column="item_location"    />
-        <result property="difficultyLevel"    column="difficulty_level"    />
-        <result property="discriminationType"    column="discrimination_type"    />
-        <result property="isRecovered"    column="is_recovered"    />
-        <result property="machineOperatingYears"    column="machine_operating_years"    />
-        <result property="certificateLevel"    column="certificate_level"    />
-        <result property="gender"    column="gender"    />
-        <result property="missCheckReasonCategory"    column="miss_check_reason_category"    />
-        <result property="monthlyAssessment"    column="monthly_assessment"    />
-        <result property="selfTestHasMissCheck"    column="self_test_has_miss_check"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="del_flag"    />
+        <result property="id" column="id"/>
+        <result property="brigadeId" column="brigade_id"/>
+        <result property="brigadeName" column="brigade_name"/>
+        <result property="terminalId" column="terminal_id"/>
+        <result property="terminalName" column="terminal_name"/>
+        <result property="areaId" column="area_id"/>
+        <result property="areaName" column="area_name"/>
+        <result property="channelId" column="channel_id"/>
+        <result property="channelName" column="channel_name"/>
+        <result property="reviewedUserId" column="reviewed_user_id"/>
+        <result property="reviewedUserName" column="reviewed_user_name"/>
+        <result property="reviewUserId" column="review_user_id"/>
+        <result property="reviewUserName" column="review_user_name"/>
+        <result property="supervisorId" column="supervisor_id"/>
+        <result property="supervisorName" column="supervisor_name"/>
+        <result property="actingSupervisorId" column="acting_supervisor_id"/>
+        <result property="actingSupervisorName" column="acting_supervisor_name"/>
+        <result property="teamLeaderId" column="team_leader_id"/>
+        <result property="teamLeaderName" column="team_leader_name"/>
+        <result property="reviewDate" column="review_date"/>
+        <result property="missCheckTime" column="miss_check_time"/>
+        <result property="missCheckTimePeriod" column="miss_check_time_period"/>
+        <result property="missCheckItem" column="miss_check_item"/>
+        <result property="itemLocation" column="item_location"/>
+        <result property="difficultyLevel" column="difficulty_level"/>
+        <result property="discriminationType" column="discrimination_type"/>
+        <result property="isRecovered" column="is_recovered"/>
+        <result property="machineOperatingYears" column="machine_operating_years"/>
+        <result property="certificateLevel" column="certificate_level"/>
+        <result property="gender" column="gender"/>
+        <result property="missCheckReasonCategory" column="miss_check_reason_category"/>
+        <result property="monthlyAssessment" column="monthly_assessment"/>
+        <result property="selfTestHasMissCheck" column="self_test_has_miss_check"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
     </resultMap>
 
     <sql id="selectBlockedMissCheckStatisticsVo">
-        select id, brigade_id, brigade_name, terminal_id, terminal_name, area_id, area_name, 
-               channel_id, channel_name, reviewed_user_id, reviewed_user_name, review_user_id, 
-               review_user_name, supervisor_id, supervisor_name, acting_supervisor_id, 
-               acting_supervisor_name, team_leader_id, team_leader_name, review_date, 
-               miss_check_time, miss_check_time_period, miss_check_item, item_location, 
-               difficulty_level, discrimination_type, is_recovered, machine_operating_years, 
-               certificate_level, gender, miss_check_reason_category, monthly_assessment, 
-               self_test_has_miss_check, create_by, create_time, update_by, update_time, 
-               remark, del_flag
+        select id,
+               brigade_id,
+               brigade_name,
+               terminal_id,
+               terminal_name,
+               area_id,
+               area_name,
+               channel_id,
+               channel_name,
+               reviewed_user_id,
+               reviewed_user_name,
+               review_user_id,
+               review_user_name,
+               supervisor_id,
+               supervisor_name,
+               acting_supervisor_id,
+               acting_supervisor_name,
+               team_leader_id,
+               team_leader_name,
+               review_date,
+               miss_check_time,
+               miss_check_time_period,
+               miss_check_item,
+               item_location,
+               difficulty_level,
+               discrimination_type,
+               is_recovered,
+               machine_operating_years,
+               certificate_level,
+               gender,
+               miss_check_reason_category,
+               monthly_assessment,
+               self_test_has_miss_check,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               del_flag
         from blocked_miss_check_statistics
     </sql>
 
-    <select id="selectBlockedMissCheckStatisticsList" parameterType="BlockedMissCheckStatistics" resultMap="BlockedMissCheckStatisticsResult">
+    <select id="selectBlockedMissCheckStatisticsList" parameterType="BlockedMissCheckStatistics"
+            resultMap="BlockedMissCheckStatisticsResult">
         <include refid="selectBlockedMissCheckStatisticsVo"/>
-        <where>  
+        <where>
             del_flag = '0'
-            <if test="brigadeId != null "> and brigade_id = #{brigadeId}</if>
-            <if test="brigadeName != null  and brigadeName != ''"> and brigade_name like concat('%', #{brigadeName}, '%')</if>
-            <if test="terminalId != null "> and terminal_id = #{terminalId}</if>
-            <if test="areaId != null "> and area_id = #{areaId}</if>
-            <if test="channelId != null "> and channel_id = #{channelId}</if>
-            <if test="reviewedUserId != null "> and reviewed_user_id = #{reviewedUserId}</if>
-            <if test="reviewedUserName != null  and reviewedUserName != ''"> and reviewed_user_name like concat('%', #{reviewedUserName}, '%')</if>
-            <if test="reviewUserId != null "> and review_user_id = #{reviewUserId}</if>
-            <if test="reviewDate != null "> and review_date = #{reviewDate}</if>
-            <if test="missCheckTime != null "> and DATE_FORMAT(miss_check_time, '%Y-%m-%d %H:%i') = DATE_FORMAT(#{missCheckTime}, '%Y-%m-%d %H:%i')</if>
-            <if test="difficultyLevel != null  and difficultyLevel != ''"> and difficulty_level = #{difficultyLevel}</if>
-            <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
+            <if test="brigadeId != null ">and brigade_id = #{brigadeId}</if>
+            <if test="brigadeName != null  and brigadeName != ''">and brigade_name like concat('%', #{brigadeName},
+                '%')
+            </if>
+            <if test="terminalId != null ">and terminal_id = #{terminalId}</if>
+            <if test="areaId != null ">and area_id = #{areaId}</if>
+            <if test="channelId != null ">and channel_id = #{channelId}</if>
+            <if test="reviewedUserId != null ">and reviewed_user_id = #{reviewedUserId}</if>
+            <if test="reviewedUserName != null  and reviewedUserName != ''">and reviewed_user_name like concat('%',
+                #{reviewedUserName}, '%')
+            </if>
+            <if test="reviewUserId != null ">and review_user_id = #{reviewUserId}</if>
+            <if test="reviewDate != null ">and review_date = #{reviewDate}</if>
+            <if test="missCheckTime != null ">and DATE_FORMAT(miss_check_time, '%Y-%m-%d %H:%i') =
+                DATE_FORMAT(#{missCheckTime}, '%Y-%m-%d %H:%i')
+            </if>
+            <if test="difficultyLevel != null  and difficultyLevel != ''">and difficulty_level = #{difficultyLevel}</if>
+            <if test="gender != null  and gender != ''">and gender = #{gender}</if>
         </where>
         order by review_date desc, miss_check_time desc
     </select>
-    
+
     <select id="selectBlockedMissCheckStatisticsById" parameterType="Long" resultMap="BlockedMissCheckStatisticsResult">
         <include refid="selectBlockedMissCheckStatisticsVo"/>
         where id = #{id} and del_flag = '0'
     </select>
-        
-    <insert id="insertBlockedMissCheckStatistics" parameterType="BlockedMissCheckStatistics" useGeneratedKeys="true" keyProperty="id">
+
+    <insert id="insertBlockedMissCheckStatistics" parameterType="BlockedMissCheckStatistics" useGeneratedKeys="true"
+            keyProperty="id">
         insert into blocked_miss_check_statistics
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="brigadeId != null">brigade_id,</if>
@@ -116,7 +154,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="machineOperatingYears != null">machine_operating_years,</if>
             <if test="certificateLevel != null and certificateLevel != ''">certificate_level,</if>
             <if test="gender != null and gender != ''">gender,</if>
-            <if test="missCheckReasonCategory != null and missCheckReasonCategory != ''">miss_check_reason_category,</if>
+            <if test="missCheckReasonCategory != null and missCheckReasonCategory != ''">miss_check_reason_category,
+            </if>
             <if test="monthlyAssessment != null and monthlyAssessment != ''">monthly_assessment,</if>
             <if test="selfTestHasMissCheck != null">self_test_has_miss_check,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
@@ -125,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="brigadeId != null">#{brigadeId},</if>
             <if test="brigadeName != null and brigadeName != ''">#{brigadeName},</if>
@@ -156,7 +195,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="machineOperatingYears != null">#{machineOperatingYears},</if>
             <if test="certificateLevel != null and certificateLevel != ''">#{certificateLevel},</if>
             <if test="gender != null and gender != ''">#{gender},</if>
-            <if test="missCheckReasonCategory != null and missCheckReasonCategory != ''">#{missCheckReasonCategory},</if>
+            <if test="missCheckReasonCategory != null and missCheckReasonCategory != ''">#{missCheckReasonCategory},
+            </if>
             <if test="monthlyAssessment != null and monthlyAssessment != ''">#{monthlyAssessment},</if>
             <if test="selfTestHasMissCheck != null">#{selfTestHasMissCheck},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -165,7 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateBlockedMissCheckStatistics" parameterType="BlockedMissCheckStatistics">
@@ -180,28 +220,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="channelId != null">channel_id = #{channelId},</if>
             <if test="channelName != null and channelName != ''">channel_name = #{channelName},</if>
             <if test="reviewedUserId != null">reviewed_user_id = #{reviewedUserId},</if>
-            <if test="reviewedUserName != null and reviewedUserName != ''">reviewed_user_name = #{reviewedUserName},</if>
+            <if test="reviewedUserName != null and reviewedUserName != ''">reviewed_user_name = #{reviewedUserName},
+            </if>
             <if test="reviewUserId != null">review_user_id = #{reviewUserId},</if>
             <if test="reviewUserName != null and reviewUserName != ''">review_user_name = #{reviewUserName},</if>
             <if test="supervisorId != null">supervisor_id = #{supervisorId},</if>
             <if test="supervisorName != null and supervisorName != ''">supervisor_name = #{supervisorName},</if>
             <if test="actingSupervisorId != null">acting_supervisor_id = #{actingSupervisorId},</if>
-            <if test="actingSupervisorName != null and actingSupervisorName != ''">acting_supervisor_name = #{actingSupervisorName},</if>
+            <if test="actingSupervisorName != null and actingSupervisorName != ''">acting_supervisor_name =
+                #{actingSupervisorName},
+            </if>
             <if test="teamLeaderId != null">team_leader_id = #{teamLeaderId},</if>
             <if test="teamLeaderName != null and teamLeaderName != ''">team_leader_name = #{teamLeaderName},</if>
             <if test="reviewDate != null">review_date = #{reviewDate},</if>
             <if test="missCheckTime != null">miss_check_time = #{missCheckTime},</if>
-            <if test="missCheckTimePeriod != null and missCheckTimePeriod != ''">miss_check_time_period = #{missCheckTimePeriod},</if>
+            <if test="missCheckTimePeriod != null and missCheckTimePeriod != ''">miss_check_time_period =
+                #{missCheckTimePeriod},
+            </if>
             <if test="missCheckItem != null and missCheckItem != ''">miss_check_item = #{missCheckItem},</if>
             <if test="itemLocation != null and itemLocation != ''">item_location = #{itemLocation},</if>
             <if test="difficultyLevel != null and difficultyLevel != ''">difficulty_level = #{difficultyLevel},</if>
-            <if test="discriminationType != null and discriminationType != ''">discrimination_type = #{discriminationType},</if>
+            <if test="discriminationType != null and discriminationType != ''">discrimination_type =
+                #{discriminationType},
+            </if>
             <if test="isRecovered != null">is_recovered = #{isRecovered},</if>
             <if test="machineOperatingYears != null">machine_operating_years = #{machineOperatingYears},</if>
             <if test="certificateLevel != null and certificateLevel != ''">certificate_level = #{certificateLevel},</if>
             <if test="gender != null and gender != ''">gender = #{gender},</if>
-            <if test="missCheckReasonCategory != null and missCheckReasonCategory != ''">miss_check_reason_category = #{missCheckReasonCategory},</if>
-            <if test="monthlyAssessment != null and monthlyAssessment != ''">monthly_assessment = #{monthlyAssessment},</if>
+            <if test="missCheckReasonCategory != null and missCheckReasonCategory != ''">miss_check_reason_category =
+                #{missCheckReasonCategory},
+            </if>
+            <if test="monthlyAssessment != null and monthlyAssessment != ''">monthly_assessment =
+                #{monthlyAssessment},
+            </if>
             <if test="selfTestHasMissCheck != null">self_test_has_miss_check = #{selfTestHasMissCheck},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -211,11 +262,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteBlockedMissCheckStatisticsById" parameterType="Long">
-        update blocked_miss_check_statistics set del_flag = '2' where id = #{id}
+        update blocked_miss_check_statistics
+        set del_flag = '2'
+        where id = #{id}
     </delete>
 
     <delete id="deleteBlockedMissCheckStatisticsByIds" parameterType="String">
-        update blocked_miss_check_statistics set del_flag = '2' where id in 
+        update blocked_miss_check_statistics set del_flag = '2' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

airport-common/src/main/java/com/sundot/airport/common/core/domain/BlockedMissCheckStatisticsQueryParamDto.java

@@ -0,0 +1,23 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+/**
+ * 漏检统计查询参数
+ *
+ * @author ruoyi
+ */
+@Data
+public class BlockedMissCheckStatisticsQueryParamDto extends BaseScreenQueryParamDto {
+
+    /**
+     * 大队ID
+     */
+    private Long brigadeId;
+
+    /**
+     * 大队名称
+     */
+    private String brigadeName;
+
+}