第一次提交

.gitignore

@@ -0,0 +1,88 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### JRebel ###
+rebel.xml
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+# Node.js files
+node_modules/
+package-lock.json
+
+# Documentation and test files
+CLAUDE.md
+*.curl
+nul
+
+######################################################################
+# Project-specific ignores
+
+# Documentation files
+.claude/
+docs/
+DEPLOY-HAIKOU.md
+FailedMatchItem-API-DOC.md
+HAIKOU-DEPLOYMENT-README.md
+README_DAILY_EXAM_INTEGRATION.md
+安检分级质控系统云服务信息安全保障方案.md
+安检分级质控系统信息安全保障说明书（精简版）.md
+安检分级质控系统信息安全说明文档.md
+
+# Configuration and deployment scripts
+application-haikou.yml
+deploy-haikou.sh
+nginx-dual-env.conf
+nginx.conf.new
+
+# SQL scripts
+create_tables.sql
+debug_query.sql
+sql/add_department_fields_to_daily_task.sql
+sql/daily_question_answer.sql
+sql/edu_cs_weak_module_rule.sql
+sql/quartz_daily_task_expire_job.sql
+
+# Testing and utilities
+postman/
+stress-test/
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml

LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 RuoYi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

airport-admin/pom.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>airport</artifactId>
+        <groupId>com.sundot.airport</groupId>
+        <version>3.9.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>airport-admin</artifactId>
+
+    <description>
+        web服务入口
+    </description>
+
+    <dependencies>
+
+        <!-- spring-boot-devtools -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional> <!-- 表示依赖不会传递 -->
+        </dependency>
+
+        <!-- swagger3-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
+        <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.sundot.airport</groupId>
+            <artifactId>airport-framework</artifactId>
+        </dependency>
+
+        <!-- 定时任务-->
+        <dependency>
+            <groupId>com.sundot.airport</groupId>
+            <artifactId>airport-quartz</artifactId>
+        </dependency>
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.sundot.airport</groupId>
+            <artifactId>airport-generator</artifactId>
+        </dependency>
+
+        <!-- 查获物品管理模块-->
+        <dependency>
+            <groupId>com.sundot.airport</groupId>
+            <artifactId>airport-item</artifactId>
+        </dependency>
+
+        <!-- 巡检管理模块-->
+        <dependency>
+            <groupId>com.sundot.airport</groupId>
+            <artifactId>airport-check</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.5.15</version>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>

airport-admin/src/main/java/com/sundot/airport/Application.java

@@ -0,0 +1,30 @@
+package com.sundot.airport;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * 启动程序
+ * 
+ * @author ruoyi
+ */
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+public class Application
+{
+    public static void main(String[] args)
+    {
+        // System.setProperty("spring.devtools.restart.enabled", "false");
+        SpringApplication.run(Application.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
+    }
+}

airport-admin/src/main/java/com/sundot/airport/ServletInitializer.java

@@ -0,0 +1,18 @@
+package com.sundot.airport;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * web容器中进行部署
+ * 
+ * @author ruoyi
+ */
+public class ServletInitializer extends SpringBootServletInitializer
+{
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    {
+        return application.sources(Application.class);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/approval/ApprovalController.java

@@ -0,0 +1,311 @@
+package com.sundot.airport.web.controller.approval;
+
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.system.domain.approval.ApprovalInstance;
+import com.sundot.airport.system.domain.approval.ApprovalTask;
+import com.sundot.airport.system.service.approval.IApprovalEngineService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 审批流程Controller
+ *
+ * @author simon lin
+ * @date 2025-09-06
+ */
+@RestController
+@RequestMapping("/system/approval")
+public class ApprovalController extends BaseController {
+    @Autowired
+    private IApprovalEngineService approvalEngineService;
+
+    /**
+     * 启动审批流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:start')")
+    @Log(title = "启动审批流程", businessType = BusinessType.INSERT)
+    @PostMapping("/start")
+    public AjaxResult startProcess(@RequestBody Map<String, Object> params) {
+        String workflowCode = (String) params.get("workflowCode");
+        String businessType = (String) params.get("businessType");
+        Long businessId = Long.valueOf(params.get("businessId").toString());
+        String title = (String) params.get("title");
+        Long submitterId = SecurityUtils.getUserId();
+        String submitterName = SecurityUtils.getUsername();
+        Map<String, Object> formData = (Map<String, Object>) params.get("formData");
+        Map<String, Object> businessData = (Map<String, Object>) params.get("businessData");
+
+        ApprovalInstance instance = approvalEngineService.startProcess(
+                workflowCode, businessType, businessId, title,
+                submitterId, submitterName, formData, businessData);
+
+        return AjaxResult.success("流程启动成功", instance);
+    }
+
+    /**
+     * 启动个人级别审批流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:start')")
+    @Log(title = "启动个人级别审批流程", businessType = BusinessType.INSERT)
+    @PostMapping("/start/personal")
+    public AjaxResult startPersonalLevelProcess(@RequestBody Map<String, Object> params) {
+        String businessType = (String) params.get("businessType");
+        Long businessId = Long.valueOf(params.get("businessId").toString());
+        String title = (String) params.get("title");
+        Long submitterId = SecurityUtils.getUserId();
+        String submitterName = SecurityUtils.getUsername();
+
+        // 新的个人级别检查流程参数
+        Long sectionLeaderId = null;
+        Object sectionLeaderIdObj = params.get("sectionLeaderId");
+        if (sectionLeaderIdObj != null) {
+            if (sectionLeaderIdObj instanceof Number) {
+                sectionLeaderId = ((Number) sectionLeaderIdObj).longValue();
+            } else if (sectionLeaderIdObj instanceof String) {
+                sectionLeaderId = Long.parseLong((String) sectionLeaderIdObj);
+            }
+        }
+
+        if (sectionLeaderId == null) {
+            return AjaxResult.error("sectionLeaderId参数不能为空");
+        }
+
+        Map<String, Object> formData = (Map<String, Object>) params.get("formData");
+        Map<String, Object> businessData = (Map<String, Object>) params.get("businessData");
+
+        ApprovalInstance instance = approvalEngineService.startPersonalLevelProcess(
+                businessType, businessId, title, submitterId, submitterName,
+                sectionLeaderId, formData, businessData);
+
+        return AjaxResult.success("个人级别流程启动成功", instance);
+    }
+
+    /**
+     * 启动科级审批流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:start')")
+    @Log(title = "启动科级审批流程", businessType = BusinessType.INSERT)
+    @PostMapping("/start/section")
+    public AjaxResult startSectionLevelProcess(@RequestBody Map<String, Object> params) {
+        String businessType = (String) params.get("businessType");
+        Long businessId = Long.valueOf(params.get("businessId").toString());
+        String title = (String) params.get("title");
+        Long submitterId = SecurityUtils.getUserId();
+        String submitterName = SecurityUtils.getUsername();
+
+        // 新的科级审批流程参数
+        Long sectionLeaderId = null;
+        Object sectionLeaderIdObj = params.get("sectionLeaderId");
+        if (sectionLeaderIdObj != null) {
+            if (sectionLeaderIdObj instanceof Number) {
+                sectionLeaderId = ((Number) sectionLeaderIdObj).longValue();
+            } else if (sectionLeaderIdObj instanceof String) {
+                sectionLeaderId = Long.parseLong((String) sectionLeaderIdObj);
+            }
+        }
+
+        if (sectionLeaderId == null) {
+            return AjaxResult.error("sectionLeaderId参数不能为空");
+        }
+
+        Map<String, Object> formData = (Map<String, Object>) params.get("formData");
+        Map<String, Object> businessData = (Map<String, Object>) params.get("businessData");
+
+        ApprovalInstance instance = approvalEngineService.startSectionLevelProcess(
+                businessType, businessId, title, submitterId, submitterName, sectionLeaderId, formData, businessData);
+
+        return AjaxResult.success("科级审批流程启动成功", instance);
+    }
+
+    /**
+     * 启动班组级审批流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:start')")
+    @Log(title = "启动班组级审批流程", businessType = BusinessType.INSERT)
+    @PostMapping("/start/group")
+    public AjaxResult startGroupLevelProcess(@RequestBody Map<String, Object> params) {
+        String businessType = (String) params.get("businessType");
+        Long businessId = Long.valueOf(params.get("businessId").toString());
+        String title = (String) params.get("title");
+        Long submitterId = SecurityUtils.getUserId();
+        String submitterName = SecurityUtils.getUsername();
+        Map<String, Object> formData = (Map<String, Object>) params.get("formData");
+        Map<String, Object> businessData = (Map<String, Object>) params.get("businessData");
+
+        ApprovalInstance instance = approvalEngineService.startGroupLevelProcess(
+                businessType, businessId, title, submitterId, submitterName, formData, businessData);
+
+        return AjaxResult.success("班组级审批流程启动成功", instance);
+    }
+
+    /**
+     * 启动查获上报审批流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:start')")
+    @Log(title = "启动查获上报审批流程", businessType = BusinessType.INSERT)
+    @PostMapping("/start/seizure")
+    public AjaxResult startSeizureReportProcess(@RequestBody Map<String, Object> params) {
+        String businessType = (String) params.get("businessType");
+        Long businessId = Long.valueOf(params.get("businessId").toString());
+        String title = (String) params.get("title");
+        Long submitterId = SecurityUtils.getUserId();
+        String submitterName = SecurityUtils.getUsername();
+        String submitterRole = (String) params.get("submitterRole");
+        Map<String, Object> formData = (Map<String, Object>) params.get("formData");
+        Map<String, Object> businessData = (Map<String, Object>) params.get("businessData");
+
+        ApprovalInstance instance = approvalEngineService.startSeizureReportProcess(
+                businessType, businessId, title, submitterId, submitterName,
+                submitterRole, formData, businessData);
+
+        return AjaxResult.success("查获上报审批流程启动成功", instance);
+    }
+
+    /**
+     * 审批任务（同意）
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:approve')")
+    @Log(title = "审批任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/approve/{taskId}")
+    public AjaxResult approveTask(@PathVariable("taskId") Long taskId, @RequestBody Map<String, Object> params) {
+        Long operatorId = SecurityUtils.getUserId();
+        String operatorName = SecurityUtils.getUsername();
+        String comment = (String) params.get("comment");
+        Map<String, Object> formData = (Map<String, Object>) params.get("formData");
+
+        boolean result = approvalEngineService.approveTask(taskId, operatorId, operatorName, comment, formData);
+        return result ? AjaxResult.success("审批成功") : AjaxResult.error("审批失败");
+    }
+
+    /**
+     * 驳回任务
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:reject')")
+    @Log(title = "驳回任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/reject/{taskId}")
+    public AjaxResult rejectTask(@PathVariable("taskId") Long taskId, @RequestBody Map<String, Object> params) {
+        Long operatorId = SecurityUtils.getUserId();
+        String operatorName = SecurityUtils.getUsername();
+        String comment = (String) params.get("comment");
+
+        boolean result = approvalEngineService.rejectTask(taskId, operatorId, operatorName, comment);
+        return result ? AjaxResult.success("驳回成功") : AjaxResult.error("驳回失败");
+    }
+
+    /**
+     * 取消审批流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:cancel')")
+    @Log(title = "取消审批流程", businessType = BusinessType.UPDATE)
+    @PutMapping("/cancel/{instanceId}")
+    public AjaxResult cancelProcess(@PathVariable("instanceId") Long instanceId, @RequestBody Map<String, Object> params) {
+        Long operatorId = SecurityUtils.getUserId();
+        String operatorName = SecurityUtils.getUsername();
+        String comment = (String) params.get("comment");
+
+        boolean result = approvalEngineService.cancelProcess(instanceId, operatorId, operatorName, comment);
+        return result ? AjaxResult.success("取消成功") : AjaxResult.error("取消失败");
+    }
+
+    /**
+     * 获取用户待办任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/tasks/pending")
+    public TableDataInfo getPendingTasks() {
+        Long userId = SecurityUtils.getUserId();
+        List<ApprovalTask> list = approvalEngineService.getUserPendingTasks(userId);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取用户已办任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/tasks/completed")
+    public TableDataInfo getCompletedTasks() {
+        Long userId = SecurityUtils.getUserId();
+        List<ApprovalTask> list = approvalEngineService.getUserCompletedTasks(userId);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取用户发起的审批实例列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/instances/submitted")
+    public TableDataInfo getSubmittedInstances(String status) {
+        Long userId = SecurityUtils.getUserId();
+        List<ApprovalInstance> list = approvalEngineService.getUserSubmittedInstances(userId, status);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据业务类型和级别获取流程代码
+     */
+    @GetMapping("/workflow/code")
+    public AjaxResult getWorkflowCode(String businessType, String level, String submitterRole) {
+        String workflowCode = approvalEngineService.getWorkflowCodeByBusinessAndLevel(businessType, level, submitterRole);
+        return AjaxResult.success(workflowCode);
+    }
+
+    /**
+     * 统计用户待办任务数量
+     */
+    @GetMapping("/tasks/pending/count")
+    public AjaxResult getPendingTasksCount() {
+        Long userId = SecurityUtils.getUserId();
+        List<ApprovalTask> tasks = approvalEngineService.getUserPendingTasks(userId);
+        return AjaxResult.success(tasks.size());
+    }
+
+    /**
+     * 批量审批任务（同意）
+     *
+     * @param ids 任务ID列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:approve')")
+    @Log(title = "审批任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/approve/list")
+    public AjaxResult approveTaskList(@RequestBody List<Long> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return AjaxResult.error("ID列表不能为空");
+        }
+        boolean result = approvalEngineService.approveTaskList(ids);
+        return result ? AjaxResult.success("审批成功") : AjaxResult.error("审批失败");
+    }
+
+    /**
+     * 批量驳回任务
+     *
+     * @param ids 任务ID列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:reject')")
+    @Log(title = "驳回任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/reject/list")
+    public AjaxResult rejectTaskList(@RequestBody List<Long> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return AjaxResult.error("ID列表不能为空");
+        }
+        boolean result = approvalEngineService.rejectTaskList(ids);
+        return result ? AjaxResult.success("驳回成功") : AjaxResult.error("驳回失败");
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/approval/CheckApprovalController.java

@@ -0,0 +1,362 @@
+package com.sundot.airport.web.controller.approval;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.system.domain.approval.ApprovalInstance;
+import com.sundot.airport.system.domain.approval.ApprovalTask;
+import com.sundot.airport.system.service.approval.IApprovalEngineService;
+import com.sundot.airport.system.service.approval.IApprovalUserService;
+import com.sundot.airport.system.service.approval.ICheckApprovalService;
+import com.sundot.airport.web.controller.approval.dto.*;
+import com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO;
+
+/**
+ * 安检审批流程Controller
+ *
+ * @author simon lin
+ * @date 2025-09-06
+ */
+@RestController
+@RequestMapping("/system/check")
+public class CheckApprovalController extends BaseController {
+    @Autowired
+    private IApprovalEngineService approvalEngineService;
+
+    @Autowired
+    private IApprovalUserService approvalUserService;
+
+    @Autowired
+    private ICheckApprovalService checkApprovalService;
+
+    /**
+     * 1. 启动个人级别审批流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:start')")
+    @Log(title = "个人级别安检检查", businessType = BusinessType.INSERT)
+    @PostMapping("/personal")
+    public AjaxResult submitPersonalCheck(@RequestBody Map<String, Object> requestData) {
+        // 获取备注参数
+        String remark = (String) requestData.get("remark");
+
+        try {
+            ApprovalInstance instance = checkApprovalService.submitPersonalCheck(
+                    requestData,
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername(),
+                    remark
+            );
+            return AjaxResult.success("个人级别检查流程启动成功", instance);
+        } catch (Exception e) {
+            logger.error("启动个人级别检查流程失败", e);
+            return AjaxResult.error("启动流程失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 2. 启动科级审批流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:start')")
+    @Log(title = "科级安检检查", businessType = BusinessType.INSERT)
+    @PostMapping("/section")
+    public AjaxResult submitSectionCheck(@RequestBody Map<String, Object> requestData) {
+        // 获取备注参数
+        String remark = (String) requestData.get("remark");
+
+        try {
+            ApprovalInstance instance = checkApprovalService.submitSectionCheck(
+                    requestData,
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername(),
+                    remark
+            );
+            return AjaxResult.success("科级检查流程启动成功", instance);
+        } catch (Exception e) {
+            logger.error("启动科级检查流程失败", e);
+            return AjaxResult.error("启动流程失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 3. 启动班组级审批流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:start')")
+    @Log(title = "班组级安检检查", businessType = BusinessType.INSERT)
+    @PostMapping("/group")
+    public AjaxResult submitGroupCheck(@RequestBody Map<String, Object> requestData) {
+        // 获取备注参数
+        String remark = (String) requestData.get("remark");
+
+        try {
+            ApprovalInstance instance = checkApprovalService.submitGroupCheck(
+                    requestData,
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername(),
+                    remark
+            );
+            return AjaxResult.success("班组级检查流程启动成功", instance);
+        } catch (Exception e) {
+            logger.error("启动班组级检查流程失败", e);
+            return AjaxResult.error("启动流程失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 4. 启动查获上报流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:start')")
+    @Log(title = "查获上报", businessType = BusinessType.INSERT)
+    @PostMapping("/seizure")
+    public AjaxResult submitSeizureReport(@RequestBody Map<String, Object> requestData) {
+        // 获取备注参数
+        String remark = (String) requestData.get("remark");
+
+        try {
+            ApprovalInstance instance = checkApprovalService.submitSeizureReport(
+                    requestData,
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername(),
+                    remark
+            );
+            return AjaxResult.success("查获上报流程启动成功", instance);
+        } catch (Exception e) {
+            logger.error("启动查获上报流程失败", e);
+            return AjaxResult.error("启动流程失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 5. 审批任务（同意）
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:approve')")
+    @Log(title = "审批任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/approval/approve/{taskId}")
+    public AjaxResult approveTask(@PathVariable Long taskId, @Valid @RequestBody ApprovalDTO approvalData) {
+        try {
+            ApprovalTask task = checkApprovalService.approveTask(
+                    taskId,
+                    approvalData.getComment(),
+                    approvalData.getFormData(),
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername()
+            );
+            return AjaxResult.success("任务审批成功", task);
+        } catch (Exception e) {
+            logger.error("审批任务失败", e);
+            return AjaxResult.error("审批失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 6. 审批任务（驳回）
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:reject')")
+    @Log(title = "驳回任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/approval/reject/{taskId}")
+    public AjaxResult rejectTask(@PathVariable Long taskId, @Valid @RequestBody RejectDTO rejectData) {
+        try {
+            ApprovalTask task = checkApprovalService.rejectTask(
+                    taskId,
+                    rejectData.getRejectReason(),
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername()
+            );
+            return AjaxResult.success("任务驳回成功", task);
+        } catch (Exception e) {
+            logger.error("驳回任务失败", e);
+            return AjaxResult.error("驳回失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 7. 获取待办任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/approval/tasks/pending")
+    public TableDataInfo getPendingTasks() {
+        try {
+            List<ApprovalTask> list = checkApprovalService.getPendingTasks(SecurityUtils.getUserId());
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error("获取待办任务列表失败", e);
+            return getDataTable(null);
+        }
+    }
+
+    /**
+     * 8. 获取已办任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/approval/tasks/completed")
+    public TableDataInfo getCompletedTasks() {
+        try {
+            List<ApprovalTask> list = checkApprovalService.getCompletedTasks(SecurityUtils.getUserId());
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error("获取已办任务列表失败", e);
+            return getDataTable(null);
+        }
+    }
+
+    /**
+     * 9. 获取我发起的审批实例
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/approval/instances/submitted")
+    public TableDataInfo getSubmittedInstances(@RequestParam(required = false) String status) {
+        try {
+            List<ApprovalInstance> list = checkApprovalService.getSubmittedInstances(SecurityUtils.getUserId(), status);
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error("获取提交实例列表失败", e);
+            return getDataTable(null);
+        }
+    }
+
+    /**
+     * 10. 取消流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:cancel')")
+    @Log(title = "取消审批流程", businessType = BusinessType.UPDATE)
+    @PutMapping("/approval/cancel/{instanceId}")
+    public AjaxResult cancelProcess(@PathVariable Long instanceId, @RequestParam String comment) {
+        try {
+            boolean success = approvalEngineService.cancelProcess(instanceId, SecurityUtils.getUserId(), SecurityUtils.getUsername(), comment);
+            if (!success) {
+                return AjaxResult.error("取消失败");
+            }
+            ApprovalInstance instance = null; // 返回空对象或查询实例
+            return AjaxResult.success("流程取消成功", instance);
+        } catch (Exception e) {
+            logger.error("取消流程失败", e);
+            return AjaxResult.error("取消失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 11. 根据业务类型获取工作流代码
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/approval/workflow-code")
+    public AjaxResult getWorkflowCode(@RequestParam String businessType,
+                                      @RequestParam(required = false) String submitterRole) {
+        try {
+            // 暂时返回空值，需要实现该方法
+            String workflowCode = null;
+            return AjaxResult.success("获取工作流代码成功", workflowCode);
+        } catch (Exception e) {
+            logger.error("获取工作流代码失败", e);
+            return AjaxResult.error("获取失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 12. 获取待办任务数量
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/approval/tasks/pending/count")
+    public AjaxResult getPendingTasksCount() {
+        try {
+            Long count = checkApprovalService.getPendingTaskCount(SecurityUtils.getUserId());
+            return AjaxResult.success("获取待办任务数量成功", count);
+        } catch (Exception e) {
+            logger.error("获取待办任务数量失败", e);
+            return AjaxResult.error("获取失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 13. 获取当前用户的抄送列表详情
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/approval/cc/details")
+    public TableDataInfo getCcDetails() {
+        try {
+            startPage();
+            List<ApprovalCcDetailDTO> list = checkApprovalService.getCcDetailsByUserId(SecurityUtils.getUserId());
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error("获取抄送详情列表失败", e);
+            return getDataTable(null);
+        }
+    }
+
+    /**
+     * 14. 根据实例ID获取审批历史
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/approval/history/instance/{instanceId}")
+    public TableDataInfo getApprovalHistoryByInstanceId(@PathVariable Long instanceId) {
+        try {
+            List<com.sundot.airport.system.domain.approval.ApprovalHistory> list =
+                    checkApprovalService.getApprovalHistoryByInstanceId(instanceId);
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error("根据实例ID获取审批历史失败", e);
+            return getDataTable(null);
+        }
+    }
+
+    /**
+     * 15. 根据任务ID获取审批历史
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/approval/history/task/{taskId}")
+    public TableDataInfo getApprovalHistoryByTaskId(@PathVariable Long taskId) {
+        try {
+            List<com.sundot.airport.system.domain.approval.ApprovalHistory> list =
+                    checkApprovalService.getApprovalHistoryByTaskId(taskId);
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error("根据任务ID获取审批历史失败", e);
+            return getDataTable(null);
+        }
+    }
+
+    /**
+     * 16. 获取用户的审批历史记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:query')")
+    @GetMapping("/approval/history/user")
+    public TableDataInfo getUserApprovalHistory(@RequestParam(required = false) String action) {
+        try {
+            List<com.sundot.airport.system.domain.approval.ApprovalHistory> list =
+                    checkApprovalService.getUserApprovalHistory(SecurityUtils.getUserId(), action);
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error("获取用户审批历史失败", e);
+            return getDataTable(null);
+        }
+    }
+
+    /**
+     * 17. 批量更新抄送消息已读状态
+     */
+    @PreAuthorize("@ss.hasPermi('system:approval:update')")
+    @Log(title = "批量更新抄送已读状态", businessType = BusinessType.UPDATE)
+    @PutMapping("/approval/cc/batch-read")
+    public AjaxResult batchUpdateCcReadStatus(@RequestBody List<Long> ids) {
+        try {
+            if (ids == null || ids.isEmpty()) {
+                return AjaxResult.error("ID列表不能为空");
+            }
+            int rows = checkApprovalService.batchUpdateCcReadStatus(ids);
+            return AjaxResult.success("批量更新成功", rows);
+        } catch (Exception e) {
+            logger.error("批量更新抄送已读状态失败", e);
+            return AjaxResult.error("更新失败：" + e.getMessage());
+        }
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/approval/dto/ApprovalDTO.java

@@ -0,0 +1,170 @@
+package com.sundot.airport.web.controller.approval.dto;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 审批DTO
+ *
+ * @author simon lin
+ * @date 2025-09-06
+ */
+public class ApprovalDTO {
+    /**
+     * 审批意见
+     */
+    @NotBlank(message = "审批意见不能为空")
+    private String comment;
+
+    /**
+     * 节点类型
+     */
+    private String nodeType;
+
+    /**
+     * 目标班组ID
+     */
+    private Long targetGroupId;
+
+    /**
+     * 整改要求
+     */
+    private String rectificationRequirement;
+
+    /**
+     * 整改详情
+     */
+    private String rectificationDetail;
+
+    /**
+     * 整改时间
+     */
+    private Date rectificationTime;
+
+    /**
+     * 整改结果
+     */
+    private String rectificationResult;
+
+    /**
+     * 复查结果
+     */
+    private String reviewResult;
+
+    /**
+     * 复查意见
+     */
+    private String reviewComment;
+
+    /**
+     * 最终决定
+     */
+    private String finalDecision;
+
+    /**
+     * 复查时间
+     */
+    private Date reviewTime;
+
+    /**
+     * 表单数据
+     */
+    private Map<String, Object> formData;
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public String getNodeType() {
+        return nodeType;
+    }
+
+    public void setNodeType(String nodeType) {
+        this.nodeType = nodeType;
+    }
+
+    public Long getTargetGroupId() {
+        return targetGroupId;
+    }
+
+    public void setTargetGroupId(Long targetGroupId) {
+        this.targetGroupId = targetGroupId;
+    }
+
+    public String getRectificationRequirement() {
+        return rectificationRequirement;
+    }
+
+    public void setRectificationRequirement(String rectificationRequirement) {
+        this.rectificationRequirement = rectificationRequirement;
+    }
+
+    public String getRectificationDetail() {
+        return rectificationDetail;
+    }
+
+    public void setRectificationDetail(String rectificationDetail) {
+        this.rectificationDetail = rectificationDetail;
+    }
+
+    public Date getRectificationTime() {
+        return rectificationTime;
+    }
+
+    public void setRectificationTime(Date rectificationTime) {
+        this.rectificationTime = rectificationTime;
+    }
+
+    public String getRectificationResult() {
+        return rectificationResult;
+    }
+
+    public void setRectificationResult(String rectificationResult) {
+        this.rectificationResult = rectificationResult;
+    }
+
+    public String getReviewResult() {
+        return reviewResult;
+    }
+
+    public void setReviewResult(String reviewResult) {
+        this.reviewResult = reviewResult;
+    }
+
+    public String getReviewComment() {
+        return reviewComment;
+    }
+
+    public void setReviewComment(String reviewComment) {
+        this.reviewComment = reviewComment;
+    }
+
+    public String getFinalDecision() {
+        return finalDecision;
+    }
+
+    public void setFinalDecision(String finalDecision) {
+        this.finalDecision = finalDecision;
+    }
+
+    public Date getReviewTime() {
+        return reviewTime;
+    }
+
+    public void setReviewTime(Date reviewTime) {
+        this.reviewTime = reviewTime;
+    }
+
+    public Map<String, Object> getFormData() {
+        return formData;
+    }
+
+    public void setFormData(Map<String, Object> formData) {
+        this.formData = formData;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/approval/dto/PersonalCheckDTO.java

@@ -0,0 +1,81 @@
+package com.sundot.airport.web.controller.approval.dto;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 个人级别检查DTO
+ *
+ * @author simon lin
+ * @date 2025-09-06
+ */
+public class PersonalCheckDTO {
+    /**
+     * 业务ID
+     */
+    @NotNull(message = "业务ID不能为空")
+    private Long id;
+
+    /**
+     * 检查描述
+     */
+    @NotBlank(message = "检查描述不能为空")
+    private String description;
+
+    /**
+     * 检查类型
+     */
+    private String checkType;
+
+    /**
+     * 检查位置
+     */
+    private String location;
+
+    /**
+     * 目标用户ID列表
+     */
+    @NotNull(message = "目标用户ID列表不能为空")
+    private Long[] targetUserIds;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getCheckType() {
+        return checkType;
+    }
+
+    public void setCheckType(String checkType) {
+        this.checkType = checkType;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public Long[] getTargetUserIds() {
+        return targetUserIds;
+    }
+
+    public void setTargetUserIds(Long[] targetUserIds) {
+        this.targetUserIds = targetUserIds;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/approval/dto/RejectDTO.java

@@ -0,0 +1,25 @@
+package com.sundot.airport.web.controller.approval.dto;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 驳回DTO
+ *
+ * @author simon lin
+ * @date 2025-09-06
+ */
+public class RejectDTO {
+    /**
+     * 驳回理由
+     */
+    @NotBlank(message = "驳回理由不能为空")
+    private String rejectReason;
+
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/approval/dto/SectionCheckDTO.java

@@ -0,0 +1,79 @@
+package com.sundot.airport.web.controller.approval.dto;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 科级检查DTO
+ *
+ * @author simon lin
+ * @date 2025-09-06
+ */
+public class SectionCheckDTO {
+    /**
+     * 业务ID
+     */
+    @NotNull(message = "业务ID不能为空")
+    private Long id;
+
+    /**
+     * 检查描述
+     */
+    @NotBlank(message = "检查描述不能为空")
+    private String description;
+
+    /**
+     * 检查类型
+     */
+    private String checkType;
+
+    /**
+     * 严重程度
+     */
+    private String severity;
+
+    /**
+     * 目标部门ID
+     */
+    private Long targetDeptId;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getCheckType() {
+        return checkType;
+    }
+
+    public void setCheckType(String checkType) {
+        this.checkType = checkType;
+    }
+
+    public String getSeverity() {
+        return severity;
+    }
+
+    public void setSeverity(String severity) {
+        this.severity = severity;
+    }
+
+    public Long getTargetDeptId() {
+        return targetDeptId;
+    }
+
+    public void setTargetDeptId(Long targetDeptId) {
+        this.targetDeptId = targetDeptId;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/approval/dto/SeizureReportDTO.java

@@ -0,0 +1,93 @@
+package com.sundot.airport.web.controller.approval.dto;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 查获上报DTO
+ *
+ * @author simon lin
+ * @date 2025-09-06
+ */
+public class SeizureReportDTO {
+    /**
+     * 业务ID
+     */
+    @NotNull(message = "业务ID不能为空")
+    private Long id;
+
+    /**
+     * 物品类型
+     */
+    @NotBlank(message = "物品类型不能为空")
+    private String itemType;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 位置
+     */
+    private String location;
+
+    /**
+     * 查获时间
+     */
+    private Date seizureTime;
+
+    /**
+     * 旅客信息
+     */
+    private String passengerInfo;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(String itemType) {
+        this.itemType = itemType;
+    }
+
+    public Integer getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(Integer quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public Date getSeizureTime() {
+        return seizureTime;
+    }
+
+    public void setSeizureTime(Date seizureTime) {
+        this.seizureTime = seizureTime;
+    }
+
+    public String getPassengerInfo() {
+        return passengerInfo;
+    }
+
+    public void setPassengerInfo(String passengerInfo) {
+        this.passengerInfo = passengerInfo;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendanceAreaController.java

@@ -0,0 +1,52 @@
+package com.sundot.airport.web.controller.attendance;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.sundot.airport.attendance.domain.AttendanceArea;
+import com.sundot.airport.attendance.service.AttendanceAreaService;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@RestController
+@RequestMapping("/attendance/area")
+public class AttendanceAreaController extends BaseController {
+
+    @Autowired
+    private AttendanceAreaService attendanceService;
+
+    /**
+     * 查询是否在考勤范围
+     *
+     * @param lng 经度
+     * @param lat 纬度
+     * @return
+     */
+    @PostMapping("/check-in")
+    public AjaxResult checkUserInValidArea(@RequestParam BigDecimal lng,
+                                           @RequestParam BigDecimal lat) {
+        List<AttendanceArea> validAreas = attendanceService.checkUserInValidArea(lng, lat);
+        if (CollectionUtil.isEmpty(validAreas)) {
+            return AjaxResult.error("不在任何考勤范围内");
+        }
+        return success(validAreas);
+    }
+
+    /**
+     * 考勤打卡列表
+     *
+     * @return
+     */
+    @PostMapping("/list")
+    public AjaxResult areaList() {
+        List<AttendanceArea> validAreas = attendanceService.areaList();
+        if (CollectionUtil.isEmpty(validAreas)) {
+            return AjaxResult.error("没有考勤范围");
+        }
+        return success(validAreas);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendanceCheckRecordController.java

@@ -0,0 +1,91 @@
+package com.sundot.airport.web.controller.attendance;
+
+import com.sundot.airport.attendance.domain.AttendanceCheckRecord;
+import com.sundot.airport.attendance.service.IAttendanceCheckRecordService;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 打卡记录Controller
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+@RestController
+@RequestMapping("/attendance/checkRecord")
+public class AttendanceCheckRecordController extends BaseController {
+    @Autowired
+    private IAttendanceCheckRecordService attendanceCheckRecordService;
+
+    /**
+     * 查询打卡记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:checkRecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(AttendanceCheckRecord attendanceCheckRecord) {
+        startPage();
+        List<AttendanceCheckRecord> list = attendanceCheckRecordService.selectAttendanceCheckRecordList(attendanceCheckRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出打卡记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:checkRecord:export')")
+    @Log(title = "打卡记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AttendanceCheckRecord attendanceCheckRecord) {
+        List<AttendanceCheckRecord> list = attendanceCheckRecordService.selectAttendanceCheckRecordList(attendanceCheckRecord);
+        ExcelUtil<AttendanceCheckRecord> util = new ExcelUtil<AttendanceCheckRecord>(AttendanceCheckRecord.class);
+        util.exportExcel(response, list, "打卡记录数据");
+    }
+
+    /**
+     * 获取打卡记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:checkRecord:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(attendanceCheckRecordService.selectAttendanceCheckRecordById(id));
+    }
+
+    /**
+     * 新增打卡记录
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:checkRecord:add')")
+    @Log(title = "打卡记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AttendanceCheckRecord attendanceCheckRecord) {
+        return toAjax(attendanceCheckRecordService.insertAttendanceCheckRecord(attendanceCheckRecord));
+    }
+
+    /**
+     * 修改打卡记录
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:checkRecord:edit')")
+    @Log(title = "打卡记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AttendanceCheckRecord attendanceCheckRecord) {
+        return toAjax(attendanceCheckRecordService.updateAttendanceCheckRecord(attendanceCheckRecord));
+    }
+
+    /**
+     * 删除打卡记录
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:checkRecord:remove')")
+    @Log(title = "打卡记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(attendanceCheckRecordService.deleteAttendanceCheckRecordByIds(ids));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendanceRecordController.java

@@ -0,0 +1,289 @@
+package com.sundot.airport.web.controller.attendance;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.attendance.domain.AttendanceRecord;
+import com.sundot.airport.attendance.dto.AttendanceRecordImportVO;
+import com.sundot.airport.attendance.service.IAttendanceRecordService;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.dto.UserInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.web.core.utils.DataPermissionUtils;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.web.core.cache.UserCache;
+import com.sundot.airport.common.core.domain.DataPermissionResult;
+import com.sundot.airport.common.enums.DataPermissionType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 考勤记录Controller
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+@RestController
+@RequestMapping("/attendance/attendanceRecord")
+public class AttendanceRecordController extends BaseController {
+    @Autowired
+    private IAttendanceRecordService attendanceRecordService;
+
+    @Autowired
+    private UserCache userCache;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * 查询考勤记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:attendanceRecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(AttendanceRecord attendanceRecord) {
+        // 应用数据权限过滤
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case SELF:
+                attendanceRecord.setUserId(dataPermission.getValue());
+                break;
+            case STATION:
+                attendanceRecord.setStationCode(dataPermission.getValue().toString());
+                break;
+            case BRIGADE:
+                attendanceRecord.setBrigadeCode(dataPermission.getValue().toString());
+                break;
+            case DEPARTMENT:
+                attendanceRecord.setDepartmentCode(dataPermission.getValue().toString());
+                break;
+            case TEAM:
+                attendanceRecord.setTeamCode(dataPermission.getValue().toString());
+                break;
+            case ALL:
+            default:
+                // 不设置过滤条件，查看所有数据
+                break;
+        }
+
+        startPage();
+        List<AttendanceRecord> list = attendanceRecordService.selectAttendanceRecordList(attendanceRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出考勤记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:attendanceRecord:export')")
+    @Log(title = "考勤记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AttendanceRecord attendanceRecord) {
+        // 应用数据权限过滤
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case SELF:
+                attendanceRecord.setUserId(dataPermission.getValue());
+                break;
+            case STATION:
+                attendanceRecord.setStationCode(dataPermission.getValue().toString());
+                break;
+            case BRIGADE:
+                attendanceRecord.setBrigadeCode(dataPermission.getValue().toString());
+                break;
+            case DEPARTMENT:
+                attendanceRecord.setDepartmentCode(dataPermission.getValue().toString());
+                break;
+            case TEAM:
+                attendanceRecord.setTeamCode(dataPermission.getValue().toString());
+                break;
+            case ALL:
+            default:
+                // 不设置过滤条件，查看所有数据
+                break;
+        }
+
+        List<AttendanceRecord> list = attendanceRecordService.selectAttendanceRecordList(attendanceRecord);
+        ExcelUtil<AttendanceRecord> util = new ExcelUtil<AttendanceRecord>(AttendanceRecord.class);
+        util.exportExcel(response, list, "考勤记录数据");
+    }
+
+    /**
+     * 获取考勤记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:attendanceRecord:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(attendanceRecordService.selectAttendanceRecordById(id));
+    }
+
+    /**
+     * 新增考勤记录
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:attendanceRecord:add')")
+    @Log(title = "考勤记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AttendanceRecord attendanceRecord) {
+        UserInfo userInfo = userCache.getUserInfo(attendanceRecord.getUserId());
+        if (Objects.nonNull(userInfo.getTeamsId())) {
+            attendanceRecord.setTeamCode(userInfo.getTeamsId().toString());
+        }
+        attendanceRecord.setTeamName(userInfo.getTeamsName());
+        if (Objects.nonNull(userInfo.getDepartmentId())) {
+            attendanceRecord.setDepartmentCode(userInfo.getDepartmentId().toString());
+        }
+        attendanceRecord.setDepartmentName(userInfo.getDepartmentName());
+        if (Objects.nonNull(userInfo.getBrigadeId())) {
+            attendanceRecord.setBrigadeCode(userInfo.getBrigadeId().toString());
+        }
+        attendanceRecord.setBrigadeName(userInfo.getBrigadeName());
+        if (Objects.nonNull(userInfo.getStationId())) {
+            attendanceRecord.setStationCode(userInfo.getStationId().toString());
+        }
+        attendanceRecord.setStationName(userInfo.getStationName());
+        attendanceRecord.setUserName(userInfo.getNickName());
+        attendanceRecord.setRevision(1L);
+        attendanceRecord.setWorkDuration((attendanceRecord.getCheckOutTime().getTime() - attendanceRecord.getCheckInTime().getTime()) / 1000 / 60);
+        attendanceRecord.setAttendanceDate(DateUtil.date(attendanceRecord.getCheckInTime()));
+        attendanceRecord.setOverDuration(0L);
+        attendanceRecord.setCreateBy(getUserId().toString());
+        return toAjax(attendanceRecordService.insertAttendanceRecord(attendanceRecord));
+    }
+
+    /**
+     * 修改考勤记录
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:attendanceRecord:edit')")
+    @Log(title = "考勤记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AttendanceRecord attendanceRecord) {
+        attendanceRecord.setUpdateBy(getUserId().toString());
+        attendanceRecord.setRevision(attendanceRecord.getRevision() + 1);
+        attendanceRecord.setWorkDuration((attendanceRecord.getCheckOutTime().getTime() - attendanceRecord.getCheckInTime().getTime()) / 1000 / 60);
+        attendanceRecord.setAttendanceDate(DateUtil.date(attendanceRecord.getCheckInTime()));
+        return toAjax(attendanceRecordService.updateAttendanceRecord(attendanceRecord));
+    }
+
+    /**
+     * 删除考勤记录
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:attendanceRecord:remove')")
+    @Log(title = "考勤记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(attendanceRecordService.deleteAttendanceRecordByIds(ids));
+    }
+
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<AttendanceRecordImportVO> util = new ExcelUtil<AttendanceRecordImportVO>(AttendanceRecordImportVO.class);
+        util.importTemplateExcel(response, "用户数据");
+    }
+
+    @Log(title = "考勤管理", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('attendance:attendanceRecord:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        ExcelUtil<AttendanceRecordImportVO> util = new ExcelUtil<AttendanceRecordImportVO>(AttendanceRecordImportVO.class);
+        List<AttendanceRecordImportVO> list = util.importExcel(file.getInputStream());
+        if (CollectionUtil.isEmpty(list)) {
+            throw new ServiceException("导入用户数据不能为空");
+        }
+        validateData(list);
+        String message = importData(list);
+        return success(message);
+    }
+
+    private void validateData(List<AttendanceRecordImportVO> list) {
+        StringBuilder failureMsg = new StringBuilder();
+        int failureNum = 2;
+        for (AttendanceRecordImportVO vo : list) {
+            if (StrUtil.isBlank(vo.getUserName())) {
+                failureMsg.append("<br/>第 ").append(failureNum).append(" 行用户姓名不能为空");
+            }
+            UserInfo userInfo = userCache.getUserInfo(vo.getUserName());
+            if (Objects.isNull(userInfo) || Objects.isNull(userInfo.getUserId())) {
+                failureMsg.append("<br/>第 ").append(failureNum).append(" 行用户不存在");
+            }
+            if (ObjUtil.isNull(vo.getAttendanceDate())) {
+                failureMsg.append("<br/>第 ").append(failureNum).append(" 行考勤日期格式错误或者不能为空");
+            }
+            if (ObjUtil.isNull(vo.getCheckInTime())) {
+                failureMsg.append("<br/>第 ").append(failureNum).append(" 行签到时间格式错误或者不能为空");
+            }
+            if (ObjUtil.isNull(vo.getCheckOutTime())) {
+                failureMsg.append("<br/>第 ").append(failureNum).append(" 行签退时间格式错误或者不能为空");
+            }
+            failureNum++;
+        }
+        if (StrUtil.isNotBlank(failureMsg)) {
+            throw new ServiceException(failureMsg.toString());
+        }
+    }
+
+    private String importData(List<AttendanceRecordImportVO> list) {
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (AttendanceRecordImportVO vo : list) {
+            UserInfo userInfo = userCache.getUserInfo(vo.getUserName());
+            try {
+                AttendanceRecord attendanceRecord = new AttendanceRecord();
+                attendanceRecord.setRevision(1L);
+                attendanceRecord.setUserId(userInfo.getUserId());
+                attendanceRecord.setCheckInTime(vo.getCheckInTime());
+                attendanceRecord.setCheckOutTime(vo.getCheckOutTime());
+                attendanceRecord.setWorkDuration((attendanceRecord.getCheckOutTime().getTime() - attendanceRecord.getCheckInTime().getTime()) / 1000 / 60);
+                if (Objects.nonNull(userInfo.getTeamsId())) {
+                    attendanceRecord.setTeamCode(userInfo.getTeamsId().toString());
+                }
+                attendanceRecord.setTeamName(userInfo.getTeamsName());
+                if (Objects.nonNull(userInfo.getDepartmentId())) {
+                    attendanceRecord.setDepartmentCode(userInfo.getDepartmentId().toString());
+                }
+                attendanceRecord.setDepartmentName(userInfo.getDepartmentName());
+                if (Objects.nonNull(userInfo.getBrigadeId())) {
+                    attendanceRecord.setBrigadeCode(userInfo.getBrigadeId().toString());
+                }
+                attendanceRecord.setBrigadeName(userInfo.getBrigadeName());
+                if (Objects.nonNull(userInfo.getStationId())) {
+                    attendanceRecord.setStationCode(userInfo.getStationId().toString());
+                }
+                attendanceRecord.setStationName(userInfo.getStationName());
+                attendanceRecord.setUserName(userInfo.getNickName());
+                attendanceRecord.setRemark(vo.getRemark());
+                attendanceRecord.setAttendanceDate(vo.getAttendanceDate());
+                attendanceRecord.setOverDuration(0L);
+                attendanceRecord.setCreateBy(getUserId().toString());
+                attendanceRecord.setCreateTime(new Date());
+                attendanceRecordService.insertAttendanceRecord(attendanceRecord);
+                successNum++;
+                successMsg.append("<br/>" + successNum + "、账号 " + userInfo.getUserName() + " 导入成功");
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、账号 " + userInfo.getUserName() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+            }
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendanceTeamUserRecordController.java

@@ -0,0 +1,166 @@
+package com.sundot.airport.web.controller.attendance;
+
+import java.util.Date;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.common.core.domain.DataPermissionResult;
+import com.sundot.airport.web.core.utils.DataPermissionUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.attendance.domain.AttendanceTeamUserRecord;
+import com.sundot.airport.attendance.service.IAttendanceTeamUserRecordService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 考勤班组成员Controller
+ *
+ * @author ruoyi
+ * @date 2025-09-06
+ */
+@RestController
+@RequestMapping("/attendance/record")
+public class AttendanceTeamUserRecordController extends BaseController {
+    @Autowired
+    private IAttendanceTeamUserRecordService attendanceTeamUserRecordService;
+
+    /**
+     * 查询考勤班组成员列表
+     *
+     * @param attendanceTeamUserRecord
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:record:list')")
+    @GetMapping("/pageList")
+    public TableDataInfo pageList(AttendanceTeamUserRecord attendanceTeamUserRecord) {
+        startPage();
+        List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordPageList(attendanceTeamUserRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 上岗记录中查询考勤班组成员列表
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:record:list')")
+    @GetMapping("/list")
+    public AjaxResult list(AttendanceTeamUserRecord attendanceTeamUserRecord) {
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case TEAM:
+                attendanceTeamUserRecord.setCreateBy(getUsername());
+                break;
+            default:
+                break;
+        }
+        attendanceTeamUserRecord.setCheckInType("1");
+        List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord, true);
+        return success(list);
+    }
+
+    /**
+     * 导出考勤班组成员列表
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:record:export')")
+    @Log(title = "考勤班组成员", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AttendanceTeamUserRecord attendanceTeamUserRecord) {
+        if (attendanceTeamUserRecord == null) {
+            attendanceTeamUserRecord = new AttendanceTeamUserRecord();
+        }
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case TEAM:
+                attendanceTeamUserRecord.setCreateBy(getUsername());
+                break;
+            default:
+                break;
+        }
+        attendanceTeamUserRecord.setCheckInType("1");
+        List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord, true);
+        ExcelUtil<AttendanceTeamUserRecord> util = new ExcelUtil<AttendanceTeamUserRecord>(AttendanceTeamUserRecord.class);
+        util.exportExcel(response, list, "考勤班组成员数据");
+    }
+
+    /**
+     * 获取考勤班组成员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:record:query')")
+    @GetMapping(value = "/{userId}")
+    public AjaxResult getInfo(@PathVariable("userId") Long userId, @PathVariable("attendanceDate") Date attendanceDate) {
+        return success(attendanceTeamUserRecordService.selectAttendanceTeamUserRecordByUserId(userId, attendanceDate, null));
+    }
+
+    /**
+     * 新增考勤班组成员
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:record:add')")
+    @Log(title = "考勤班组成员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AttendanceTeamUserRecord attendanceTeamUserRecord) {
+        return toAjax(attendanceTeamUserRecordService.insertAttendanceTeamUserRecord(attendanceTeamUserRecord));
+    }
+
+    /**
+     * 修改考勤班组成员
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:record:edit')")
+    @Log(title = "考勤班组成员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AttendanceTeamUserRecord attendanceTeamUserRecord) {
+        return toAjax(attendanceTeamUserRecordService.updateAttendanceTeamUserRecord(attendanceTeamUserRecord));
+    }
+
+    /**
+     * 删除考勤班组成员
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:record:remove')")
+    @Log(title = "考勤班组成员", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds) {
+        return toAjax(attendanceTeamUserRecordService.deleteAttendanceTeamUserRecordByUserIds(userIds));
+    }
+
+    /**
+     * 批量新增考勤班组成员
+     *
+     * @param attendanceTeamUserRecord
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:record:add:list')")
+    @Log(title = "考勤班组成员", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add/list")
+    public AjaxResult addList(@RequestBody List<AttendanceTeamUserRecord> attendanceTeamUserRecord) {
+        return toAjax(attendanceTeamUserRecordService.insertAttendanceTeamUserRecordList(attendanceTeamUserRecord));
+    }
+
+    /**
+     * 获取考勤班组成员列表
+     */
+    @GetMapping("/list/teamLeader")
+    public AjaxResult listTeamLeader() {
+        return success(attendanceTeamUserRecordService.selectAttendanceTeamLeaderId());
+    }
+
+    /**
+     * 根据主键删除考勤班组成员
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:record:remove')")
+    @Log(title = "考勤班组成员", businessType = BusinessType.DELETE)
+    @DeleteMapping("/removeBy/{ids}")
+    public AjaxResult removeBy(@PathVariable Long[] ids) {
+        return toAjax(attendanceTeamUserRecordService.deleteAttendanceTeamUserRecordByIds(ids));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/api/AttendanceController.java

@@ -0,0 +1,87 @@
+package com.sundot.airport.web.controller.attendance.api;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson2.JSON;
+import com.sundot.airport.attendance.domain.AttendanceRecord;
+import com.sundot.airport.attendance.service.IAttendanceRecordService;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.dto.AttendanceRecordDTO;
+import com.sundot.airport.common.dto.AttendanceRecordReq;
+import com.sundot.airport.common.dto.UserInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.system.service.ISysConfigService;
+import com.sundot.airport.web.core.cache.UserCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 考勤管理 h5 api
+ *
+ * @Author: wangchong
+ * @Date: 2025/7/10 14:49
+ **/
+@RestController
+@RequestMapping("/attendance")
+public class AttendanceController extends BaseController {
+
+    @Autowired
+    private IAttendanceRecordService attendanceRecordService;
+
+    @Autowired
+    private UserCache userCache;
+
+    /**
+     * 打卡签到
+     *
+     * @param dto 打卡信息
+     * @return 今日打卡历史
+     */
+    @Log(title = "打卡签到", businessType = BusinessType.INSERT)
+    @PostMapping("/v1/record")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult record(@RequestBody AttendanceRecordDTO dto) {
+        UserInfo userInfo = userCache.getUserInfo(dto.getUserId());
+        return success(attendanceRecordService.record(dto, userInfo));
+    }
+
+    /**
+     * 打卡签到列表
+     */
+    @PostMapping("/v1/record-list")
+    public AjaxResult recordList(@RequestBody AttendanceRecordReq dto) {
+        return success(attendanceRecordService.recordList(dto));
+    }
+
+    /**
+     * 查询可打卡类型:1=签到,2=签退
+     */
+    @GetMapping("/v1/getRecordType")
+    public AjaxResult getRecordType() {
+        return AjaxResult.success("操作成功", attendanceRecordService.getRecordType());
+    }
+
+    /**
+     * 根据角色标识查询今日打卡用户列表
+     */
+    @PostMapping("/selectUserListByRoleKey")
+    public AjaxResult selectUserListByRoleKey(@RequestBody List<String> roleTypeList) {
+        // 计算当前时间对应的班次日期
+        Date queryDate = DateUtils.getNowDate();
+        List<SysUser> result = attendanceRecordService.selectUserListByRoleKey(queryDate, roleTypeList);
+        return AjaxResult.success(result);
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/cache/StatisticsCacheController.java

@@ -0,0 +1,38 @@
+package com.sundot.airport.web.controller.cache;
+
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 统计缓存缓存管理控制器
+ */
+@Slf4j
+@RestController
+@RequestMapping("/statistics/cache")
+public class StatisticsCacheController extends BaseController {
+
+    /**
+     * 清理统计缓存
+     */
+    @PostMapping("/clearStatistics")
+    @CacheEvict(value = {
+            "statistics_data",
+            "statistics_list",
+            "item_station",
+            "item_ranking_detail",
+            "item_duration",
+            "item_seizure_trend",
+            "attendance_station",
+            "attendance_open_trend",
+            "base_module_info"
+    }, allEntries = true)
+    public AjaxResult clearStatisticsCache() {
+        return AjaxResult.success("统计缓存清理成功");
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckCorrectionController.java

@@ -0,0 +1,196 @@
+package com.sundot.airport.web.controller.check;
+
+import java.util.Collections;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.collection.CollUtil;
+import com.sundot.airport.common.core.domain.ApprovalWorkflowBatchDto;
+import com.sundot.airport.common.core.domain.DataPermissionResult;
+import com.sundot.airport.web.core.utils.DataPermissionUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.check.domain.CheckCorrection;
+import com.sundot.airport.check.service.ICheckCorrectionService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 问题整改Controller
+ *
+ * @author ruoyi
+ * @date 2025-09-08
+ */
+@RestController
+@RequestMapping("/check/checkCorrection")
+public class CheckCorrectionController extends BaseController {
+    @Autowired
+    private ICheckCorrectionService checkCorrectionService;
+
+    /**
+     * 查询问题整改列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CheckCorrection checkCorrection) {
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case BRIGADE:
+                checkCorrection.setCheckedBrigadeId(dataPermission.getValue());
+                break;
+            case DEPARTMENT:
+                checkCorrection.setCheckedDepartmentId(dataPermission.getValue());
+                break;
+            case TEAM:
+            case SELF:
+                return getDataTable(Collections.emptyList());
+            default:
+                break;
+        }
+        startPage();
+        List<CheckCorrection> list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出问题整改列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:export')")
+    @Log(title = "问题整改", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CheckCorrection checkCorrection) {
+        List<CheckCorrection> list = Collections.emptyList();
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case ALL:
+            case STATION:
+                list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
+                break;
+            case BRIGADE:
+                checkCorrection.setCheckedBrigadeId(dataPermission.getValue());
+                list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
+                break;
+            case DEPARTMENT:
+                checkCorrection.setCheckedDepartmentId(dataPermission.getValue());
+                list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
+                break;
+            default:
+                break;
+        }
+        ExcelUtil<CheckCorrection> util = new ExcelUtil<CheckCorrection>(CheckCorrection.class);
+        util.exportExcel(response, list, "问题整改数据");
+    }
+
+    /**
+     * 获取问题整改详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(checkCorrectionService.selectCheckCorrectionById(id));
+    }
+
+    /**
+     * 新增问题整改
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:add')")
+    @Log(title = "问题整改", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CheckCorrection checkCorrection) {
+        checkCorrection.setCreateBy(getUsername());
+        return toAjax(checkCorrectionService.insertCheckCorrection(checkCorrection));
+    }
+
+    /**
+     * 修改问题整改
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:edit')")
+    @Log(title = "问题整改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CheckCorrection checkCorrection) {
+        checkCorrection.setUpdateBy(getUsername());
+        if (CollUtil.isNotEmpty(checkCorrection.getCheckProjectItemList())) {
+            checkCorrection.getCheckProjectItemList().forEach(checkProjectItem -> {
+                checkProjectItem.setUpdateBy(getUsername());
+                if (CollUtil.isNotEmpty(checkProjectItem.getCheckUserList())) {
+                    checkProjectItem.getCheckUserList().forEach(checkUser -> {
+                        checkUser.setUpdateBy(getUsername());
+                    });
+                }
+            });
+        }
+        if (CollUtil.isNotEmpty(checkCorrection.getBaseAttachmentList())) {
+            checkCorrection.getBaseAttachmentList().forEach(baseAttachment -> {
+                baseAttachment.setUpdateBy(getUsername());
+            });
+        }
+        if (CollUtil.isNotEmpty(checkCorrection.getCheckRecordBaseAttachmentList())) {
+            checkCorrection.getCheckRecordBaseAttachmentList().forEach(baseAttachment -> {
+                baseAttachment.setUpdateBy(getUsername());
+            });
+        }
+        return toAjax(checkCorrectionService.updateCheckCorrection(checkCorrection));
+    }
+
+    /**
+     * 删除问题整改
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:remove')")
+    @Log(title = "问题整改", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(checkCorrectionService.deleteCheckCorrectionByIds(ids));
+    }
+
+    /**
+     * 审批任务（同意）
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:edit')")
+    @Log(title = "问题整改", businessType = BusinessType.UPDATE)
+    @PostMapping("/approveTask")
+    public AjaxResult approveTask(@RequestBody CheckCorrection checkCorrection) {
+        return success(checkCorrectionService.approveTask(checkCorrection));
+    }
+
+    /**
+     * 审批任务（驳回）
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:edit')")
+    @Log(title = "问题整改", businessType = BusinessType.UPDATE)
+    @PostMapping("/rejectTask")
+    public AjaxResult rejectTask(@RequestBody CheckCorrection checkCorrection) {
+        return success(checkCorrectionService.rejectTask(checkCorrection));
+    }
+
+    /**
+     * 批量审批任务（同意）
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:edit')")
+    @Log(title = "批量审批任务（同意）", businessType = BusinessType.UPDATE)
+    @PostMapping("/approveTaskBatch")
+    public AjaxResult approveTaskBatch(@RequestBody ApprovalWorkflowBatchDto approvalWorkflowBatchDto) {
+        return success(checkCorrectionService.approveTaskBatch(approvalWorkflowBatchDto));
+    }
+
+    /**
+     * 批量审批任务（驳回）
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:edit')")
+    @Log(title = "批量审批任务（驳回）", businessType = BusinessType.UPDATE)
+    @PostMapping("/rejectTaskBatch")
+    public AjaxResult rejectTaskBatch(@RequestBody ApprovalWorkflowBatchDto approvalWorkflowBatchDto) {
+        return success(checkCorrectionService.rejectTaskBatch(approvalWorkflowBatchDto));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckLargeScreenController.java

@@ -0,0 +1,256 @@
+package com.sundot.airport.web.controller.check;
+
+import com.sundot.airport.check.domain.CheckLargeScreenCommonDto;
+import com.sundot.airport.check.domain.CheckLargeScreenCorrectionDto;
+import com.sundot.airport.check.domain.CheckLargeScreenCorrectionPortraitDto;
+import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
+import com.sundot.airport.check.domain.CheckLargeScreenHomePageDto;
+import com.sundot.airport.check.domain.CheckLargeScreenInspectionExecuteDto;
+import com.sundot.airport.check.domain.CheckLargeScreenPlanOverviewDto;
+import com.sundot.airport.check.domain.CheckLargeScreenPlanQueryParamDto;
+import com.sundot.airport.check.domain.CheckLargeScreenProblemDto;
+import com.sundot.airport.check.domain.CheckLargeScreenProblemQueryParamDto;
+import com.sundot.airport.check.domain.CheckLargeScreenProblemTrendDto;
+import com.sundot.airport.check.domain.CheckTask;
+import com.sundot.airport.check.service.ICheckLargeScreenService;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.CheckLargeScreenHomePageRankingDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 巡检大屏Controller
+ *
+ * @author ruoyi
+ * @date 2025-09-07
+ */
+@RestController
+@RequestMapping("/check/largeScreen")
+public class CheckLargeScreenController extends BaseController {
+
+    @Autowired
+    private ICheckLargeScreenService checkLargeScreenService;
+
+    /**
+     * 巡检计划-计划安排总览
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/planOverview")
+    public AjaxResult planOverview(CheckLargeScreenPlanQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenPlanOverviewDto> result = checkLargeScreenService.planOverview(dto, source);
+        return success(result);
+    }
+
+    /**
+     * 巡检计划-日常任务检查指标累积分布
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/planDistribution")
+    public AjaxResult planDistribution(CheckLargeScreenPlanQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenCommonDto> result = checkLargeScreenService.planDistribution(dto, source);
+        return success(result);
+    }
+
+    /**
+     * 巡检计划-任务明细统计表
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/planStatistics")
+    public AjaxResult planStatistics(CheckLargeScreenPlanQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckTask> result = checkLargeScreenService.planStatistics(dto, source);
+        return success(result);
+    }
+
+    /**
+     * 问题发现-总体问题分布
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/problemDistribution")
+    public AjaxResult problemDistribution(CheckLargeScreenProblemQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenProblemDto> result = checkLargeScreenService.problemDistribution(dto, source);
+        return success(result);
+    }
+
+    /**
+     * 问题发现-问题分布对比
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/problemComparison")
+    public AjaxResult problemComparison(CheckLargeScreenProblemQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenProblemDto> result = checkLargeScreenService.problemComparison(dto, source);
+        return success(result);
+    }
+
+    /**
+     * 问题发现-通道面貌-问题对比
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/problemComparisonTwo")
+    public AjaxResult problemComparisonTwo(CheckLargeScreenProblemQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenProblemDto> result = checkLargeScreenService.problemComparisonTwo(dto, source);
+        return success(result);
+    }
+
+    /**
+     * 问题发现-通道面貌-问题趋势
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/problemTrend")
+    public AjaxResult problemTrend(CheckLargeScreenProblemQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenProblemTrendDto> result = checkLargeScreenService.problemTrend(dto, source);
+        return success(result);
+    }
+
+    /**
+     * 问题整改-整改状态总计
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/correction")
+    public AjaxResult correction(CheckLargeScreenCorrectionQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        CheckLargeScreenCorrectionDto result = checkLargeScreenService.correction(dto, source);
+        return success(result);
+    }
+
+    /**
+     * 问题整改-整改状态分布-科级对比
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/correctionDistribution")
+    public AjaxResult correctionDistribution(CheckLargeScreenCorrectionQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenCorrectionDto> result = checkLargeScreenService.correctionDistribution(dto, source);
+        return success(result);
+    }
+
+    /**
+     * 巡检执行
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/inspectionExecute")
+    public AjaxResult inspectionExecute(BaseLargeScreenQueryParamDto dto) {
+        List<CheckLargeScreenInspectionExecuteDto> result = checkLargeScreenService.inspectionExecute(dto);
+        return success(result);
+    }
+
+    /**
+     * 巡检画像
+     */
+    @Cacheable(
+            value = "statistics_data",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/portrait")
+    public AjaxResult portrait(CheckLargeScreenCorrectionQueryParamDto dto) {
+        CheckLargeScreenCorrectionPortraitDto result = checkLargeScreenService.portrait(dto);
+        return success(result);
+    }
+
+    /**
+     * 工作画像-管理推动-检查单
+     */
+    @Cacheable(
+            value = "statistics_list",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/managementPromotionRecord")
+    public AjaxResult managementPromotionRecord(CheckLargeScreenCorrectionQueryParamDto dto) {
+        List<CheckLargeScreenPlanOverviewDto> result = checkLargeScreenService.managementPromotionRecord(dto);
+        return success(result);
+    }
+
+    /**
+     * 工作画像-管理推动-整改单
+     */
+    @Cacheable(
+            value = "statistics_data",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/managementPromotionCorrection")
+    public AjaxResult managementPromotionCorrection(CheckLargeScreenCorrectionQueryParamDto dto) {
+        CheckLargeScreenCorrectionDto result = checkLargeScreenService.managementPromotionCorrection(dto);
+        return success(result);
+    }
+
+    /**
+     * 工作画像-工作产出-巡检问题统计图
+     */
+    @Cacheable(
+            value = "statistics_list",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/workOutputCheck")
+    public AjaxResult workOutputCheck(CheckLargeScreenCorrectionQueryParamDto dto) {
+        List<CheckLargeScreenCommonDto> result = checkLargeScreenService.workOutputCheck(dto);
+        return success(result);
+    }
+
+    /**
+     * 首页
+     */
+//    @Cacheable(
+//            value = "statistics_check_homePage",
+//            keyGenerator = "statisticsKeyGenerator",
+//            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+//    )
+    @GetMapping("/homePage")
+    public AjaxResult homePage(BaseLargeScreenQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        CheckLargeScreenHomePageDto result = checkLargeScreenService.homePage(dto, source);
+        return success(result);
+    }
+
+    /**
+     * 首页-巡检-巡检合格率
+     */
+//    @Cacheable(
+//            value = "statistics_check_passRate",
+//            keyGenerator = "statisticsKeyGenerator",
+//            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+//    )
+    @GetMapping("/checkPassRate")
+    public AjaxResult checkPassRate(BaseLargeScreenQueryParamDto dto) {
+        BigDecimal result = checkLargeScreenService.checkPassRate(dto);
+        return success(result);
+    }
+
+    /**
+     * 首页-巡检-巡检合格率排名
+     */
+//    @Cacheable(
+//            value = "statistics_check_ranking",
+//            keyGenerator = "statisticsKeyGenerator",
+//            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+//    )
+    @GetMapping("/checkRanking")
+    public AjaxResult checkRanking(BaseLargeScreenQueryParamDto dto) {
+        CheckLargeScreenHomePageRankingDto result = checkLargeScreenService.checkRanking(dto);
+        return success(result);
+    }
+
+    /**
+     * 首页-巡检-今日巡检问题数
+     */
+//    @Cacheable(
+//            value = "statistics_check_correction_count",
+//            keyGenerator = "statisticsKeyGenerator",
+//            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+//    )
+    @GetMapping("/checkCorrectionCount")
+    public AjaxResult checkCorrectionCount(BaseLargeScreenQueryParamDto dto) {
+        Integer result = checkLargeScreenService.checkCorrectionCount(dto);
+        return success(result);
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckProjectItemController.java

@@ -0,0 +1,98 @@
+package com.sundot.airport.web.controller.check;
+
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.check.domain.CheckProjectItem;
+import com.sundot.airport.check.service.ICheckProjectItemService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 检查单和检查记录和问题整改的检查项明细Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-11
+ */
+@RestController
+@RequestMapping("/check/projectItem")
+public class CheckProjectItemController extends BaseController {
+    @Autowired
+    private ICheckProjectItemService checkProjectItemService;
+
+    /**
+     * 查询检查单和检查记录和问题整改的检查项明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:projectItem:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CheckProjectItem checkProjectItem) {
+        startPage();
+        List<CheckProjectItem> list = checkProjectItemService.selectCheckProjectItemList(checkProjectItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检查单和检查记录和问题整改的检查项明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:projectItem:export')")
+    @Log(title = "检查单和检查记录和问题整改的检查项明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CheckProjectItem checkProjectItem) {
+        List<CheckProjectItem> list = checkProjectItemService.selectCheckProjectItemList(checkProjectItem);
+        ExcelUtil<CheckProjectItem> util = new ExcelUtil<CheckProjectItem>(CheckProjectItem.class);
+        util.exportExcel(response, list, "检查单和检查记录和问题整改的检查项明细数据");
+    }
+
+    /**
+     * 获取检查单和检查记录和问题整改的检查项明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('check:projectItem:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(checkProjectItemService.selectCheckProjectItemById(id));
+    }
+
+    /**
+     * 新增检查单和检查记录和问题整改的检查项明细
+     */
+    @PreAuthorize("@ss.hasPermi('check:projectItem:add')")
+    @Log(title = "检查单和检查记录和问题整改的检查项明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CheckProjectItem checkProjectItem) {
+        return toAjax(checkProjectItemService.insertCheckProjectItem(checkProjectItem));
+    }
+
+    /**
+     * 修改检查单和检查记录和问题整改的检查项明细
+     */
+    @PreAuthorize("@ss.hasPermi('check:projectItem:edit')")
+    @Log(title = "检查单和检查记录和问题整改的检查项明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CheckProjectItem checkProjectItem) {
+        return toAjax(checkProjectItemService.updateCheckProjectItem(checkProjectItem));
+    }
+
+    /**
+     * 删除检查单和检查记录和问题整改的检查项明细
+     */
+    @PreAuthorize("@ss.hasPermi('check:projectItem:remove')")
+    @Log(title = "检查单和检查记录和问题整改的检查项明细", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(checkProjectItemService.deleteCheckProjectItemByIds(ids));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckRecordController.java

@@ -0,0 +1,171 @@
+package com.sundot.airport.web.controller.check;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.common.core.domain.DataPermissionResult;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.enums.CheckRecordStatusEnum;
+import com.sundot.airport.common.enums.SourceTypeEnum;
+import com.sundot.airport.system.service.ISysUserService;
+import com.sundot.airport.web.core.utils.DataPermissionUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.check.domain.CheckRecord;
+import com.sundot.airport.check.service.ICheckRecordService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 检查记录Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-11
+ */
+@RestController
+@RequestMapping("/check/checkRecord")
+public class CheckRecordController extends BaseController {
+    @Autowired
+    private ICheckRecordService checkRecordService;
+    @Autowired
+    private ISysUserService sysUserService;
+
+    /**
+     * 查询检查记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkRecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CheckRecord checkRecord, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        List<CheckRecord> list;
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            startPage();
+            list = checkRecordService.selectCheckRecordList(checkRecord);
+        } else if (StrUtil.equals(SourceTypeEnum.web.getCode(), source)) {
+            switch (dataPermission.getPermissionType()) {
+                case ALL:
+                case STATION:
+                    break;
+                case BRIGADE:
+                case DEPARTMENT:
+                    List<SysUser> sysUserList = sysUserService.selectUserByDeptId(dataPermission.getValue());
+                    if (CollUtil.isEmpty(sysUserList)) {
+                        return getDataTable(Collections.emptyList());
+                    }
+                    List<Long> userIdList = sysUserList.stream().map(SysUser::getUserId).distinct().collect(Collectors.toList());
+                    checkRecord.setQueryCheckerIdList(userIdList);
+                    break;
+                default:
+                    return getDataTable(Collections.emptyList());
+            }
+            startPage();
+            list = checkRecordService.selectCheckRecordList(checkRecord);
+        } else {
+            return getDataTable(Collections.emptyList());
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检查记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkRecord:export')")
+    @Log(title = "检查记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CheckRecord checkRecord) {
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        List<CheckRecord> list = Collections.emptyList();
+        switch (dataPermission.getPermissionType()) {
+            case ALL:
+            case STATION:
+                list = checkRecordService.selectCheckRecordList(checkRecord);
+                break;
+            case BRIGADE:
+            case DEPARTMENT:
+                List<SysUser> sysUserList = sysUserService.selectUserByDeptId(dataPermission.getValue());
+                if (CollUtil.isNotEmpty(sysUserList)) {
+                    List<Long> userIdList = sysUserList.stream().map(SysUser::getUserId).distinct().collect(Collectors.toList());
+                    checkRecord.setQueryCheckerIdList(userIdList);
+                    list = checkRecordService.selectCheckRecordList(checkRecord);
+                }
+                break;
+            default:
+                break;
+        }
+        ExcelUtil<CheckRecord> util = new ExcelUtil<CheckRecord>(CheckRecord.class);
+        util.exportExcel(response, list, "检查记录数据");
+    }
+
+    /**
+     * 获取检查记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkRecord:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(checkRecordService.selectCheckRecordById(id));
+    }
+
+    /**
+     * 新增检查记录
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkRecord:add')")
+    @Log(title = "检查记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody CheckRecord checkRecord) {
+        checkRecord.setCreateBy(getUsername());
+        checkRecord.setCheckRecordStatus(CheckRecordStatusEnum.FORMAL.getCode());
+        checkRecord.setCheckRecordStatusDesc(CheckRecordStatusEnum.FORMAL.getDesc());
+        return toAjax(checkRecordService.insertOrUpdateCheckRecord(checkRecord, true));
+    }
+
+    /**
+     * 新增草稿检查记录
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkRecord:add')")
+    @Log(title = "草稿检查记录", businessType = BusinessType.INSERT)
+    @PostMapping("/draft")
+    public AjaxResult draft(@RequestBody CheckRecord checkRecord) {
+        checkRecord.setCreateBy(getUsername());
+        checkRecord.setCheckRecordStatus(CheckRecordStatusEnum.DRAFT.getCode());
+        checkRecord.setCheckRecordStatusDesc(CheckRecordStatusEnum.DRAFT.getDesc());
+        return toAjax(checkRecordService.insertOrUpdateCheckRecord(checkRecord, false));
+    }
+
+    /**
+     * 修改检查记录
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkRecord:edit')")
+    @Log(title = "检查记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CheckRecord checkRecord) {
+        checkRecord.setUpdateBy(getUsername());
+        return toAjax(checkRecordService.updateCheckRecord(checkRecord));
+    }
+
+    /**
+     * 删除检查记录
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkRecord:remove')")
+    @Log(title = "检查记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(checkRecordService.deleteCheckRecordByIds(ids));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckTaskController.java

@@ -0,0 +1,230 @@
+package com.sundot.airport.web.controller.check;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.common.core.domain.DataPermissionResult;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.enums.CheckLevelEnum;
+import com.sundot.airport.common.enums.CheckTaskStatusEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.enums.SourceTypeEnum;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.web.core.utils.DataPermissionUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.check.domain.CheckTask;
+import com.sundot.airport.check.service.ICheckTaskService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 检查任务Controller
+ *
+ * @author ruoyi
+ * @date 2025-09-07
+ */
+@RestController
+@RequestMapping("/check/checkTask")
+public class CheckTaskController extends BaseController {
+    @Autowired
+    private ICheckTaskService checkTaskService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * 查询检查任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CheckTask checkTask, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        startPage();
+        List<CheckTask> list;
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            switch (dataPermission.getPermissionType()) {
+                case ALL:
+                    checkTask.setCheckLevel(null);
+                    break;
+                case STATION:
+                    checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
+                    break;
+                case BRIGADE:
+                    List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+                    List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+                    if (roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                        checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                        checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                    } else {
+                        return getDataTable(Collections.emptyList());
+                    }
+                    break;
+                case DEPARTMENT:
+                    checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
+                    break;
+                case TEAM:
+                    checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
+                    SysDept teamDept = SecurityUtils.getLoginUser().getUser().getDept();
+                    SysDept departmentDept = sysDeptService.selectDeptById(teamDept.getParentId());
+                    checkTask.setSelfCheckDeptId(departmentDept.getParentId());
+                    break;
+                default:
+                    return getDataTable(Collections.emptyList());
+            }
+            list = checkTaskService.selectCheckTaskList(checkTask);
+        } else if (StrUtil.equals(SourceTypeEnum.web.getCode(), source)) {
+            switch (dataPermission.getPermissionType()) {
+                case ALL:
+                case STATION:
+                    list = checkTaskService.selectCheckTaskList(checkTask);
+                    break;
+                case BRIGADE:
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                    list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
+                    break;
+                case DEPARTMENT:
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
+                    list = checkTaskService.selectCheckTaskListWeb(checkTask);
+                    break;
+                default:
+                    return getDataTable(Collections.emptyList());
+            }
+        } else {
+            return getDataTable(Collections.emptyList());
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检查任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:export')")
+    @Log(title = "检查任务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CheckTask checkTask) {
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        List<CheckTask> list;
+        switch (dataPermission.getPermissionType()) {
+            case ALL:
+            case STATION:
+                list = checkTaskService.selectCheckTaskList(checkTask);
+                break;
+            case BRIGADE:
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
+                break;
+            case DEPARTMENT:
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
+                list = checkTaskService.selectCheckTaskListWeb(checkTask);
+                break;
+            default:
+                list = Collections.emptyList();
+                break;
+        }
+        ExcelUtil<CheckTask> util = new ExcelUtil<CheckTask>(CheckTask.class);
+        util.exportExcel(response, list, "检查任务数据");
+    }
+
+    /**
+     * 获取检查任务详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(checkTaskService.selectCheckTaskById(id));
+    }
+
+    /**
+     * 新增检查任务
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:add')")
+    @Log(title = "检查任务", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CheckTask checkTask) {
+        checkTask.setCreateId(getUserId());
+        checkTask.setCreateBy(getUsername());
+        return toAjax(checkTaskService.insertCheckTask(checkTask));
+    }
+
+    /**
+     * 修改检查任务
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:edit')")
+    @Log(title = "检查任务", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CheckTask checkTask) {
+        checkTask.setUpdateId(getUserId());
+        checkTask.setUpdateBy(getUsername());
+        return toAjax(checkTaskService.updateCheckTask(checkTask));
+    }
+
+    /**
+     * 删除检查任务
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:remove')")
+    @Log(title = "检查任务", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(checkTaskService.deleteCheckTaskByIds(ids));
+    }
+
+    /**
+     * 查询检查任务未读数量
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
+    @GetMapping("/unReadNum")
+    public AjaxResult unReadNum() {
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        CheckTask checkTask = new CheckTask();
+        checkTask.setStatus(CheckTaskStatusEnum.IN_PROGRESS.getCode());
+        switch (dataPermission.getPermissionType()) {
+            case ALL:
+                checkTask.setCheckLevel(null);
+                break;
+            case STATION:
+                checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
+                break;
+            case BRIGADE:
+                checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                break;
+            case DEPARTMENT:
+                checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
+                break;
+            case TEAM:
+                checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
+                SysDept teamDept = SecurityUtils.getLoginUser().getUser().getDept();
+                SysDept departmentDept = sysDeptService.selectDeptById(teamDept.getParentId());
+                checkTask.setSelfCheckDeptId(departmentDept.getParentId());
+                break;
+            default:
+                return success(0);
+        }
+        List<CheckTask> list = checkTaskService.selectCheckTaskList(checkTask);
+        if (CollUtil.isEmpty(list)) {
+            return success(0);
+        }
+        return success(list.stream().filter(item -> !item.isRead()).count());
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckUserController.java

@@ -0,0 +1,98 @@
+package com.sundot.airport.web.controller.check;
+
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.check.domain.CheckUser;
+import com.sundot.airport.check.service.ICheckUserService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-11
+ */
+@RestController
+@RequestMapping("/check/checkUser")
+public class CheckUserController extends BaseController {
+    @Autowired
+    private ICheckUserService checkUserService;
+
+    /**
+     * 查询检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkUser:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CheckUser checkUser) {
+        startPage();
+        List<CheckUser> list = checkUserService.selectCheckUserList(checkUser);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkUser:export')")
+    @Log(title = "检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CheckUser checkUser) {
+        List<CheckUser> list = checkUserService.selectCheckUserList(checkUser);
+        ExcelUtil<CheckUser> util = new ExcelUtil<CheckUser>(CheckUser.class);
+        util.exportExcel(response, list, "检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人数据");
+    }
+
+    /**
+     * 获取检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkUser:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(checkUserService.selectCheckUserById(id));
+    }
+
+    /**
+     * 新增检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkUser:add')")
+    @Log(title = "检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CheckUser checkUser) {
+        return toAjax(checkUserService.insertCheckUser(checkUser));
+    }
+
+    /**
+     * 修改检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkUser:edit')")
+    @Log(title = "检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CheckUser checkUser) {
+        return toAjax(checkUserService.updateCheckUser(checkUser));
+    }
+
+    /**
+     * 删除检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkUser:remove')")
+    @Log(title = "检查单检查人员和检查记录责任人和检查记录及问题整改检查项责任人", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(checkUserService.deleteCheckUserByIds(ids));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/common/CaptchaController.java

@@ -0,0 +1,94 @@
+package com.sundot.airport.web.controller.common;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.google.code.kaptcha.Producer;
+import com.sundot.airport.common.config.RuoYiConfig;
+import com.sundot.airport.common.constant.CacheConstants;
+import com.sundot.airport.common.constant.Constants;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.redis.RedisCache;
+import com.sundot.airport.common.utils.sign.Base64;
+import com.sundot.airport.common.utils.uuid.IdUtils;
+import com.sundot.airport.system.service.ISysConfigService;
+
+/**
+ * 验证码操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class CaptchaController
+{
+    @Resource(name = "captchaProducer")
+    private Producer captchaProducer;
+
+    @Resource(name = "captchaProducerMath")
+    private Producer captchaProducerMath;
+
+    @Autowired
+    private RedisCache redisCache;
+    
+    @Autowired
+    private ISysConfigService configService;
+    /**
+     * 生成验证码
+     */
+    @GetMapping("/captchaImage")
+    public AjaxResult getCode(HttpServletResponse response) throws IOException
+    {
+        AjaxResult ajax = AjaxResult.success();
+        boolean captchaEnabled = configService.selectCaptchaEnabled();
+        ajax.put("captchaEnabled", captchaEnabled);
+        if (!captchaEnabled)
+        {
+            return ajax;
+        }
+
+        // 保存验证码信息
+        String uuid = IdUtils.simpleUUID();
+        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
+
+        String capStr = null, code = null;
+        BufferedImage image = null;
+
+        // 生成验证码
+        String captchaType = RuoYiConfig.getCaptchaType();
+        if ("math".equals(captchaType))
+        {
+            String capText = captchaProducerMath.createText();
+            capStr = capText.substring(0, capText.lastIndexOf("@"));
+            code = capText.substring(capText.lastIndexOf("@") + 1);
+            image = captchaProducerMath.createImage(capStr);
+        }
+        else if ("char".equals(captchaType))
+        {
+            capStr = code = captchaProducer.createText();
+            image = captchaProducer.createImage(capStr);
+        }
+
+        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+        // 转换流信息写出
+        FastByteArrayOutputStream os = new FastByteArrayOutputStream();
+        try
+        {
+            ImageIO.write(image, "jpg", os);
+        }
+        catch (IOException e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+
+        ajax.put("uuid", uuid);
+        ajax.put("img", Base64.encode(os.toByteArray()));
+        return ajax;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/common/CommonController.java

@@ -0,0 +1,162 @@
+package com.sundot.airport.web.controller.common;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.sundot.airport.common.config.RuoYiConfig;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.common.utils.file.FileUploadUtils;
+import com.sundot.airport.common.utils.file.FileUtils;
+import com.sundot.airport.framework.config.ServerConfig;
+
+/**
+ * 通用请求处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/common")
+public class CommonController
+{
+    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+
+    @Autowired
+    private ServerConfig serverConfig;
+
+    private static final String FILE_DELIMETER = ",";
+
+    /**
+     * 通用下载请求
+     * 
+     * @param fileName 文件名称
+     * @param delete 是否删除
+     */
+    @GetMapping("/download")
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(fileName))
+            {
+                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
+            }
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, realFileName);
+            FileUtils.writeBytes(filePath, response.getOutputStream());
+            if (delete)
+            {
+                FileUtils.deleteFile(filePath);
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+
+    /**
+     * 通用上传请求（单个）
+     */
+    @PostMapping("/upload")
+    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("url", url);
+            ajax.put("fileName", fileName);
+            ajax.put("newFileName", FileUtils.getName(fileName));
+            ajax.put("originalFilename", file.getOriginalFilename());
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 通用上传请求（多个）
+     */
+    @PostMapping("/uploads")
+    public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            List<String> urls = new ArrayList<String>();
+            List<String> fileNames = new ArrayList<String>();
+            List<String> newFileNames = new ArrayList<String>();
+            List<String> originalFilenames = new ArrayList<String>();
+            for (MultipartFile file : files)
+            {
+                // 上传并返回新文件名称
+                String fileName = FileUploadUtils.upload(filePath, file);
+                String url = serverConfig.getUrl() + fileName;
+                urls.add(url);
+                fileNames.add(fileName);
+                newFileNames.add(FileUtils.getName(fileName));
+                originalFilenames.add(file.getOriginalFilename());
+            }
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
+            ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
+            ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
+            ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 本地资源通用下载
+     */
+    @GetMapping("/download/resource")
+    public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
+            throws Exception
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(resource))
+            {
+                throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
+            }
+            // 本地资源路径
+            String localPath = RuoYiConfig.getProfile();
+            // 数据库资源地址
+            String downloadPath = localPath + FileUtils.stripPrefix(resource);
+            // 下载名称
+            String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, downloadName);
+            FileUtils.writeBytes(downloadPath, response.getOutputStream());
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/common/DataConfigController.java

@@ -0,0 +1,52 @@
+package com.sundot.airport.web.controller.common;
+
+import com.sundot.airport.common.config.RuoYiConfig;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.TreeQuery;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.common.utils.file.FileUploadUtils;
+import com.sundot.airport.common.utils.file.FileUtils;
+import com.sundot.airport.framework.config.ServerConfig;
+import com.sundot.airport.system.service.ISysTreeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.sundot.airport.common.core.domain.AjaxResult.success;
+
+/**
+ * 通用数据配置树结构请求处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/dataConfig")
+public class DataConfigController
+{
+    private static final Logger log = LoggerFactory.getLogger(DataConfigController.class);
+
+    @Autowired
+    private ISysTreeService sysTreeService ;
+
+    /**
+     * 获取部门树列表
+     */
+    @GetMapping("/dataConfigTree")
+    public AjaxResult dataConfigTree(TreeQuery treeQuery)
+    {
+        return success(sysTreeService.selectTreeList(treeQuery));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/daily/DailyTaskConfigController.java

@@ -0,0 +1,143 @@
+package com.sundot.airport.web.controller.daily;
+
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.exam.domain.DailyTaskConfig;
+import com.sundot.airport.exam.dto.DailyTaskConfigDTO;
+import com.sundot.airport.exam.dto.DailyTaskConfigQueryDTO;
+import com.sundot.airport.exam.service.IDailyTaskConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <b>功能名：</b>DailyTaskConfigController<br>
+ * <b>说明：</b> 每日答题任务配置Controller <br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author Simon Lin
+ */
+@RestController
+@RequestMapping("/exam/daily/config")
+public class DailyTaskConfigController extends BaseController {
+
+    @Autowired
+    private IDailyTaskConfigService dailyTaskConfigService;
+
+    /**
+     * 查询每日答题任务配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('exam:daily:config:list')")
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody DailyTaskConfigQueryDTO queryDTO) {
+        return dailyTaskConfigService.selectConfigList(queryDTO);
+    }
+
+    /**
+     * 获取每日答题任务配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('exam:daily:config:query')")
+    @GetMapping("/{dtcId}")
+    public AjaxResult getInfo(@PathVariable("dtcId") String dtcId) {
+        return success(dailyTaskConfigService.selectConfigById(dtcId));
+    }
+
+    /**
+     * 新增每日答题任务配置
+     */
+    @PreAuthorize("@ss.hasPermi('exam:daily:config:add')")
+    @Log(title = "每日答题任务配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody DailyTaskConfigDTO dto) {
+        return toAjax(dailyTaskConfigService.insertConfig(dto));
+    }
+
+    /**
+     * 修改每日答题任务配置
+     */
+    @PreAuthorize("@ss.hasPermi('exam:daily:config:edit')")
+    @Log(title = "每日答题任务配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody DailyTaskConfigDTO dto) {
+        return toAjax(dailyTaskConfigService.updateConfig(dto));
+    }
+
+    /**
+     * 删除每日答题任务配置
+     */
+    @PreAuthorize("@ss.hasPermi('exam:daily:config:remove')")
+    @Log(title = "每日答题任务配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dtcIds}")
+    public AjaxResult remove(@PathVariable String[] dtcIds) {
+        return toAjax(dailyTaskConfigService.deleteConfigByIds(dtcIds));
+    }
+
+    /**
+     * 启用/停用每日答题任务配置
+     */
+    @PreAuthorize("@ss.hasPermi('exam:daily:config:edit')")
+    @Log(title = "每日答题任务配置", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestParam("dtcId") String dtcId,
+                                    @RequestParam("enableStatus") Boolean enableStatus) {
+        return toAjax(dailyTaskConfigService.updateConfigStatus(dtcId, enableStatus));
+    }
+
+    /**
+     * 根据当前用户获取有效配置
+     * 遍历用户的所有角色，收集所有匹配的有效配置，并选择最新的配置
+     */
+    @GetMapping("/effective")
+    public AjaxResult getEffectiveConfig() {
+        // 获取当前用户的角色ID列表和部门
+        Long deptId = getDeptId();
+
+        // 获取用户的所有角色ID
+        java.util.List<Long> roleIds = getLoginUser().getUser().getRoles().stream()
+                .map(role -> role.getRoleId())
+                .collect(java.util.stream.Collectors.toList());
+
+        if (roleIds.isEmpty()) {
+            return AjaxResult.error("用户未分配角色");
+        }
+
+        // 收集所有角色匹配的有效配置
+        java.util.List<DailyTaskConfig> matchedConfigs = new java.util.ArrayList<>();
+        for (Long roleId : roleIds) {
+            DailyTaskConfig config = dailyTaskConfigService.getEffectiveConfig(roleId, deptId);
+            if (config != null) {
+                matchedConfigs.add(config);
+            }
+        }
+
+        if (matchedConfigs.isEmpty()) {
+            return AjaxResult.error("未找到适用的答题配置");
+        }
+
+        // 选择最新的配置（根据创建时间降序排序，取第一个）
+        DailyTaskConfig latestConfig = matchedConfigs.stream()
+                .sorted((c1, c2) -> c2.getCreateTime().compareTo(c1.getCreateTime()))
+                .findFirst()
+                .orElse(null);
+
+        return success(latestConfig);
+    }
+
+    /**
+     * 获取默认配置（第一条配置）
+     * 用于单配置管理页面
+     */
+    @GetMapping("/default")
+    public AjaxResult getDefaultConfig() {
+        DailyTaskConfig config = dailyTaskConfigService.getDefaultConfig();
+        if (config == null) {
+            return AjaxResult.error("暂无配置数据");
+        }
+        return success(config);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/daily/DeptProfileController.java

@@ -0,0 +1,210 @@
+package com.sundot.airport.web.controller.daily;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.exam.domain.DailyTask;
+import com.sundot.airport.exam.dto.DeptProfileDTO;
+import com.sundot.airport.exam.dto.DeptProfileQueryDTO;
+import com.sundot.airport.exam.mapper.DailyTaskMapper;
+import com.sundot.airport.exam.service.IDeptProfileService;
+import com.sundot.airport.system.service.ISysDeptService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <b>功能名：</b>DeptProfileController<br>
+ * <b>说明：</b> 组织画像Controller <br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author Claude
+ */
+@Api(tags = "组织画像")
+@RestController
+@RequestMapping("/exam/daily/dept-profile")
+public class DeptProfileController extends BaseController {
+
+    @Autowired
+    private IDeptProfileService deptProfileService;
+
+    @Autowired
+    private DailyTaskMapper dailyTaskMapper;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    /**
+     * 获取组织画像
+     */
+    @ApiOperation("获取组织画像")
+    @GetMapping
+    public AjaxResult getDeptProfile(
+            @ApiParam(value = "部门ID", required = true)
+            @RequestParam Long deptId,
+
+            @ApiParam(value = "开始日期", required = false, example = "2025-01-01")
+            @RequestParam(required = false) String startDate,
+
+            @ApiParam(value = "结束日期", required = false, example = "2025-01-31")
+            @RequestParam(required = false) String endDate) {
+
+        // 如果没有传日期范围,则默认为91天
+        if (startDate == null || endDate == null) {
+            java.time.LocalDate today = java.time.LocalDate.now();
+            endDate = today.toString();
+            startDate = today.minusDays(91).toString();
+        }
+
+        DeptProfileQueryDTO query = new DeptProfileQueryDTO();
+        query.setDeptId(deptId);
+        query.setStartDate(startDate);
+        query.setEndDate(endDate);
+
+        DeptProfileDTO profile = deptProfileService.getDeptProfile(query);
+
+        return success(profile);
+    }
+
+    /**
+     * 获取部门每日抽问抽答完成率
+     * 统计该部门及其所有下级部门成员的抽问抽答完成率
+     * 例如：传入科级ID，统计该科级下所有班组成员的完成率
+     */
+    @ApiOperation("获取部门每日抽问抽答完成率")
+    @GetMapping("/daily-completion-rate")
+    public AjaxResult getDailyCompletionRate(
+            @ApiParam(value = "部门ID（可以是科级ID、班组ID等）", required = true)
+            @RequestParam Long deptId,
+
+            @ApiParam(value = "开始日期", required = false, example = "2025-01-01")
+            @RequestParam(required = false) String startDate,
+
+            @ApiParam(value = "结束日期", required = false, example = "2025-01-31")
+            @RequestParam(required = false) String endDate) {
+
+        try {
+            // 如果没有传日期范围,则默认为91天
+            if (startDate == null || endDate == null) {
+                LocalDate today = LocalDate.now();
+                endDate = today.toString();
+                startDate = today.minusDays(91).toString();
+            }
+
+            // 获取该部门及所有下级部门的ID列表（例如：科级 -> 所有班组）
+            List<Long> deptIds = getAllSubDeptIds(deptId);
+            logger.info("查询部门ID={} 的下级部门，共找到 {} 个部门: {}", deptId, deptIds.size(), deptIds);
+
+            if (deptIds.isEmpty()) {
+                return success(new ArrayList<>());
+            }
+
+            // 转换日期
+            LocalDate start = LocalDate.parse(startDate);
+            LocalDate end = LocalDate.parse(endDate);
+
+            // 构建日期范围的Map，存储每一天的完成率
+            Map<String, Map<String, Object>> dailyStats = new LinkedHashMap<>();
+
+            // 初始化每一天的数据
+            LocalDate currentDate = start;
+            while (!currentDate.isAfter(end)) {
+                String dateStr = currentDate.toString();
+                Map<String, Object> dayData = new HashMap<>();
+                dayData.put("date", dateStr);
+                dayData.put("completionRate", BigDecimal.ZERO);
+                dayData.put("totalTasks", 0);
+                dayData.put("completedTasks", 0);
+                dailyStats.put(dateStr, dayData);
+                currentDate = currentDate.plusDays(1);
+            }
+
+            // 查询该时间段内所有任务
+            LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(DailyTask::getDtDeptId, deptIds);
+            wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(startDate));
+            wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(endDate));
+            wrapper.eq(DailyTask::getDelStatus, 0);
+
+            List<DailyTask> tasks = dailyTaskMapper.selectList(wrapper);
+            logger.info("查询到 {} 条任务记录", tasks.size());
+
+            // 按日期分组统计（使用SimpleDateFormat格式化日期）
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Map<String, List<DailyTask>> tasksByDate = tasks.stream()
+                    .collect(Collectors.groupingBy(task -> sdf.format(task.getDtBusinessDate())));
+
+            // 计算每一天的完成率
+            for (Map.Entry<String, List<DailyTask>> entry : tasksByDate.entrySet()) {
+                String dateStr = entry.getKey();
+                List<DailyTask> dayTasks = entry.getValue();
+
+                int totalTasks = dayTasks.size();
+                long completedTasks = dayTasks.stream()
+                        .filter(task -> "COMPLETED".equals(task.getDtStatus()))
+                        .count();
+
+                BigDecimal completionRate = BigDecimal.ZERO;
+                if (totalTasks > 0) {
+                    completionRate = new BigDecimal(completedTasks)
+                            .multiply(new BigDecimal(100))
+                            .divide(new BigDecimal(totalTasks), 2, RoundingMode.HALF_UP);
+                }
+
+                if (dailyStats.containsKey(dateStr)) {
+                    Map<String, Object> dayData = dailyStats.get(dateStr);
+                    dayData.put("completionRate", completionRate);
+                    dayData.put("totalTasks", totalTasks);
+                    dayData.put("completedTasks", completedTasks);
+                }
+            }
+
+            // 转换为数组返回
+            List<Map<String, Object>> result = new ArrayList<>(dailyStats.values());
+
+            return success(result);
+        } catch (Exception e) {
+            logger.error("获取部门每日完成率失败", e);
+            return error("获取部门每日完成率失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取指定部门及其所有下级部门的ID列表
+     * 根据sys_dept表的层级关系递归查找
+     * 例如：传入科级ID，返回该科级ID及其所有下级班组ID
+     */
+    private List<Long> getAllSubDeptIds(Long deptId) {
+        List<Long> result = new ArrayList<>();
+        result.add(deptId); // 包含自己
+
+        // 查询直接下级部门
+        SysDept queryDept = new SysDept();
+        queryDept.setParentId(deptId);
+        List<SysDept> subDepts = deptService.selectDeptInfoAll(queryDept);
+
+        // 递归查询所有下级部门
+        for (SysDept subDept : subDepts) {
+            if ("0".equals(subDept.getDelFlag())) { // 只包含未删除的部门
+                result.addAll(getAllSubDeptIds(subDept.getDeptId()));
+            }
+        }
+
+        return result;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/daily/SiteProfileController.java

@@ -0,0 +1,208 @@
+package com.sundot.airport.web.controller.daily;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.exam.domain.DailyTask;
+import com.sundot.airport.exam.dto.SiteProfileDTO;
+import com.sundot.airport.exam.dto.SiteProfileQueryDTO;
+import com.sundot.airport.exam.mapper.DailyTaskMapper;
+import com.sundot.airport.exam.service.ISiteProfileService;
+import com.sundot.airport.system.service.ISysDeptService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <b>功能名：</b>SiteProfileController<br>
+ * <b>说明：</b> 站级画像Controller <br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author Claude
+ */
+@Api(tags = "站级画像")
+@RestController
+@RequestMapping("/exam/daily/site-profile")
+public class SiteProfileController extends BaseController {
+
+    @Autowired
+    private ISiteProfileService siteProfileService;
+
+    @Autowired
+    private DailyTaskMapper dailyTaskMapper;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    /**
+     * 获取站级画像
+     */
+    @ApiOperation("获取站级画像")
+    @GetMapping
+    public AjaxResult getSiteProfile(
+            @ApiParam(value = "站级ID", required = true)
+            @RequestParam Long siteId,
+
+            @ApiParam(value = "开始日期", required = false, example = "2025-01-01")
+            @RequestParam(required = false) String startDate,
+
+            @ApiParam(value = "结束日期", required = false, example = "2025-01-31")
+            @RequestParam(required = false) String endDate) {
+
+        // 如果没有传日期范围,则默认为91天
+        if (startDate == null || endDate == null) {
+            java.time.LocalDate today = java.time.LocalDate.now();
+            endDate = today.toString();
+            startDate = today.minusDays(91).toString();
+        }
+
+        SiteProfileQueryDTO query = new SiteProfileQueryDTO();
+        query.setSiteId(siteId);
+        query.setStartDate(startDate);
+        query.setEndDate(endDate);
+
+        SiteProfileDTO profile = siteProfileService.getSiteProfile(query);
+
+        return success(profile);
+    }
+
+    /**
+     * 获取站级每日抽问抽答完成率
+     * 统计该站级及其所有下级部门（科级、班组等）成员的抽问抽答完成率
+     * 例如：传入站级ID，统计该站级下所有科级、班组成员的完成率
+     */
+    @ApiOperation("获取站级每日抽问抽答完成率")
+    @GetMapping("/daily-completion-rate")
+    public AjaxResult getDailyCompletionRate(
+            @ApiParam(value = "站级ID", required = true)
+            @RequestParam Long siteId,
+
+            @ApiParam(value = "开始日期", required = false, example = "2025-01-01")
+            @RequestParam(required = false) String startDate,
+
+            @ApiParam(value = "结束日期", required = false, example = "2025-01-31")
+            @RequestParam(required = false) String endDate) {
+
+        try {
+            // 如果没有传日期范围,则默认为91天
+            if (startDate == null || endDate == null) {
+                LocalDate today = LocalDate.now();
+                endDate = today.toString();
+                startDate = today.minusDays(91).toString();
+            }
+
+            // 获取该站级及所有下级部门的ID列表（站级 -> 科级 -> 班组）
+            List<Long> deptIds = getAllSubDeptIds(siteId);
+
+            if (deptIds.isEmpty()) {
+                return success(new ArrayList<>());
+            }
+
+            // 转换日期
+            LocalDate start = LocalDate.parse(startDate);
+            LocalDate end = LocalDate.parse(endDate);
+
+            // 构建日期范围的Map，存储每一天的完成率
+            Map<String, Map<String, Object>> dailyStats = new LinkedHashMap<>();
+
+            // 初始化每一天的数据
+            LocalDate currentDate = start;
+            while (!currentDate.isAfter(end)) {
+                String dateStr = currentDate.toString();
+                Map<String, Object> dayData = new HashMap<>();
+                dayData.put("date", dateStr);
+                dayData.put("completionRate", BigDecimal.ZERO);
+                dayData.put("totalTasks", 0);
+                dayData.put("completedTasks", 0);
+                dailyStats.put(dateStr, dayData);
+                currentDate = currentDate.plusDays(1);
+            }
+
+            // 查询该时间段内所有任务
+            LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(DailyTask::getDtDeptId, deptIds);
+            wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(startDate));
+            wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(endDate));
+            wrapper.eq(DailyTask::getDelStatus, 0);
+
+            List<DailyTask> tasks = dailyTaskMapper.selectList(wrapper);
+
+            // 按日期分组统计（使用SimpleDateFormat格式化日期）
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Map<String, List<DailyTask>> tasksByDate = tasks.stream()
+                    .collect(Collectors.groupingBy(task -> sdf.format(task.getDtBusinessDate())));
+
+            // 计算每一天的完成率
+            for (Map.Entry<String, List<DailyTask>> entry : tasksByDate.entrySet()) {
+                String dateStr = entry.getKey();
+                List<DailyTask> dayTasks = entry.getValue();
+
+                int totalTasks = dayTasks.size();
+                long completedTasks = dayTasks.stream()
+                        .filter(task -> "COMPLETED".equals(task.getDtStatus()))
+                        .count();
+
+                BigDecimal completionRate = BigDecimal.ZERO;
+                if (totalTasks > 0) {
+                    completionRate = new BigDecimal(completedTasks)
+                            .multiply(new BigDecimal(100))
+                            .divide(new BigDecimal(totalTasks), 2, RoundingMode.HALF_UP);
+                }
+
+                if (dailyStats.containsKey(dateStr)) {
+                    Map<String, Object> dayData = dailyStats.get(dateStr);
+                    dayData.put("completionRate", completionRate);
+                    dayData.put("totalTasks", totalTasks);
+                    dayData.put("completedTasks", completedTasks);
+                }
+            }
+
+            // 转换为数组返回
+            List<Map<String, Object>> result = new ArrayList<>(dailyStats.values());
+
+            return success(result);
+        } catch (Exception e) {
+            logger.error("获取站级每日完成率失败", e);
+            return error("获取站级每日完成率失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取指定站级及其所有下级部门的ID列表
+     * 根据sys_dept表的层级关系递归查找
+     * 例如：传入站级ID，返回该站级ID及其所有下级科级、班组ID
+     */
+    private List<Long> getAllSubDeptIds(Long siteId) {
+        List<Long> result = new ArrayList<>();
+        result.add(siteId); // 包含自己
+
+        // 查询直接下级部门
+        SysDept queryDept = new SysDept();
+        queryDept.setParentId(siteId);
+        List<SysDept> subDepts = deptService.selectDeptInfoAll(queryDept);
+
+        // 递归查询所有下级部门
+        for (SysDept subDept : subDepts) {
+            if ("0".equals(subDept.getDelFlag())) { // 只包含未删除的部门
+                result.addAll(getAllSubDeptIds(subDept.getDeptId()));
+            }
+        }
+
+        return result;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/BaseController.java

@@ -0,0 +1,20 @@
+package com.sundot.airport.web.controller.exam;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * <b>功能名：</b>BaseController<br>
+ * <b>说明：</b> 基本controller管理抽象类 <br>
+ * <b>著作权：</b> Copyright (C) 2021 HUIFANEDU  CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author 2021-06-17 liangxiao
+ */
+public abstract class BaseController {
+
+    /**
+     * 日志记录
+     */
+    protected final Logger log = LoggerFactory.getLogger(this.getClass());
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/DailyExamComparisonController.java

@@ -0,0 +1,395 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.domain.DailyTask;
+import com.sundot.airport.exam.mapper.DailyTaskMapper;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.sql.Date;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 抽问抽答完成趋势对比接口（PC管理端，美兰4级架构）
+ * STATION（安检站）> BRIGADE（大队）> MANAGER（主管）> 班组
+ *
+ * xAxis 为周期标签，每条 series 的 data 为各周期聚合完成数：
+ *   YEAR    → [去年总数, 当年总数]               xAxis: ["2025年","2026年"]
+ *   QUARTER → [去年同季度, 上季度, 当季度]        xAxis: ["2025年第1季度","2025年第4季度","2026年第1季度"]
+ *   MONTH   → [去年同月, 上月, 当月]              xAxis: ["2025年3月","2026年2月","2026年3月"]
+ *
+ * 同比 yoyRate   = (当期 - 去年同期) / 去年同期 × 100
+ * 环比 chainRatio = (当期 - 上期)   / 上期     × 100（仅 QUARTER/MONTH）
+ */
+@RestController
+@RequestMapping("/v1/cs/app/daily-exam")
+public class DailyExamComparisonController {
+
+    private static final Logger log = LoggerFactory.getLogger(DailyExamComparisonController.class);
+
+    private static final String[] QUARTER_NAMES = {"第一", "第二", "第三", "第四"};
+
+    @Autowired
+    private DailyTaskMapper dailyTaskMapper;
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    /**
+     * 抽问抽答完成趋势对比
+     *
+     * @param dateRangeQueryType 时间类型：YEAR/QUARTER/MONTH，默认 MONTH
+     * @param year               年份，默认当前年
+     * @param quarter            季度 1-4，dateRangeQueryType=QUARTER 时有效
+     * @param month              月份 1-12，dateRangeQueryType=MONTH 时有效
+     * @param scopeType          统计范围：STATION/BRIGADE/MANAGER/TEAM/USER，不传则按登录角色自动判断
+     * @param scopeId            统计范围ID（deptId 或 userId）
+     */
+    @GetMapping("/completion-comparison")
+    public HttpResult<Map<String, Object>> getCompletionComparison(
+            @RequestParam(required = false, defaultValue = "MONTH") String dateRangeQueryType,
+            @RequestParam(required = false) Integer year,
+            @RequestParam(required = false) Integer quarter,
+            @RequestParam(required = false) Integer month,
+            @RequestParam(required = false) String scopeType,
+            @RequestParam(required = false) Long scopeId) {
+
+        try {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            List<String> roleKeys = loginUser.getUser().getRoles().stream()
+                    .map(SysRole::getRoleKey).collect(Collectors.toList());
+            Long userDeptId = loginUser.getDeptId();
+            Long userId = loginUser.getUserId();
+
+            boolean isStation = userId == 1L
+                    || roleKeys.contains(RoleTypeEnum.admin.getCode())
+                    || roleKeys.contains(RoleTypeEnum.test.getCode())
+                    || roleKeys.contains(RoleTypeEnum.zhijianke.getCode());
+            boolean isBrigade = !isStation && (roleKeys.contains(RoleTypeEnum.jingli.getCode())
+                    || roleKeys.contains(RoleTypeEnum.xingzheng.getCode()));
+            boolean isManager = !isStation && !isBrigade && roleKeys.contains(RoleTypeEnum.kezhang.getCode());
+
+            if (scopeType == null && !isStation && !isBrigade && !isManager) {
+                Map<String, Object> noShow = new HashMap<>();
+                noShow.put("show", false);
+                return HttpResult.success(noShow);
+            }
+
+            LocalDate today = LocalDate.now();
+            int curYear = (year != null) ? year : today.getYear();
+            int curQuarter = (quarter != null) ? quarter : ((today.getMonthValue() - 1) / 3 + 1);
+            int curMonth = (month != null) ? month : today.getMonthValue();
+
+            List<String> xAxis = buildXAxisLabels(dateRangeQueryType, curYear, curQuarter, curMonth);
+            List<LocalDate[]> periods = buildPeriods(dateRangeQueryType, curYear, curQuarter, curMonth);
+            boolean hasChain = !"YEAR".equals(dateRangeQueryType);
+
+            List<Map<String, Object>> series = buildSeries(
+                    scopeType, scopeId, xAxis, periods, hasChain,
+                    isStation, isBrigade, isManager, userDeptId, loginUser);
+
+            Map<String, Object> result = new LinkedHashMap<>();
+            result.put("show", true);
+            result.put("xAxis", xAxis);
+            result.put("series", series);
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取抽问抽答完成趋势对比失败", e);
+            return HttpResult.error("获取完成趋势对比失败：" + e.getMessage());
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // xAxis 标签
+    // -------------------------------------------------------------------------
+
+    /**
+     * YEAR    → ["2025年", "2026年"]
+     * QUARTER → ["2025年第1季度", "2025年第4季度", "2026年第1季度"]
+     * MONTH   → ["2025年3月", "2026年2月", "2026年3月"]
+     */
+    private List<String> buildXAxisLabels(String type, int year, int quarter, int month) {
+        List<String> labels = new ArrayList<>();
+        switch (type == null ? "MONTH" : type) {
+            case "YEAR":
+                labels.add((year - 1) + "年");
+                labels.add(year + "年");
+                break;
+            case "QUARTER": {
+                labels.add((year - 1) + "年" + QUARTER_NAMES[quarter - 1] + "季度");
+                int prevQ = quarter - 1, prevYear = year;
+                if (prevQ < 1) { prevQ = 4; prevYear = year - 1; }
+                labels.add(prevYear + "年" + QUARTER_NAMES[prevQ - 1] + "季度");
+                labels.add(year + "年" + QUARTER_NAMES[quarter - 1] + "季度");
+                break;
+            }
+            default: {
+                labels.add((year - 1) + "年" + month + "月");
+                int prevM = month - 1, prevYear = year;
+                if (prevM < 1) { prevM = 12; prevYear = year - 1; }
+                labels.add(prevYear + "年" + prevM + "月");
+                labels.add(year + "年" + month + "月");
+                break;
+            }
+        }
+        return labels;
+    }
+
+    // -------------------------------------------------------------------------
+    // 周期日期范围
+    // -------------------------------------------------------------------------
+
+    /**
+     * 返回各周期日期范围（顺序与 xAxis 对应）
+     * YEAR    → [去年全年, 今年全年]           (size=2)
+     * QUARTER → [去年同季度, 上季度, 当季度]    (size=3)
+     * MONTH   → [去年同月, 上月, 当月]          (size=3)
+     */
+    private List<LocalDate[]> buildPeriods(String type, int year, int quarter, int month) {
+        List<LocalDate[]> periods = new ArrayList<>();
+        switch (type == null ? "MONTH" : type) {
+            case "YEAR":
+                periods.add(yearRange(year - 1));
+                periods.add(yearRange(year));
+                break;
+            case "QUARTER": {
+                periods.add(quarterRange(year - 1, quarter));
+                int prevQ = quarter - 1, prevYear = year;
+                if (prevQ < 1) { prevQ = 4; prevYear = year - 1; }
+                periods.add(quarterRange(prevYear, prevQ));
+                periods.add(quarterRange(year, quarter));
+                break;
+            }
+            default: {
+                periods.add(monthRange(year - 1, month));
+                int prevM = month - 1, prevYear = year;
+                if (prevM < 1) { prevM = 12; prevYear = year - 1; }
+                periods.add(monthRange(prevYear, prevM));
+                periods.add(monthRange(year, month));
+                break;
+            }
+        }
+        return periods;
+    }
+
+    private LocalDate[] yearRange(int y) {
+        return new LocalDate[]{LocalDate.of(y, 1, 1), LocalDate.of(y, 12, 31)};
+    }
+
+    private LocalDate[] quarterRange(int y, int q) {
+        LocalDate start = LocalDate.of(y, (q - 1) * 3 + 1, 1);
+        return new LocalDate[]{start, start.plusMonths(3).minusDays(1)};
+    }
+
+    private LocalDate[] monthRange(int y, int m) {
+        LocalDate start = LocalDate.of(y, m, 1);
+        return new LocalDate[]{start, start.withDayOfMonth(start.lengthOfMonth())};
+    }
+
+    // -------------------------------------------------------------------------
+    // series 构建
+    // -------------------------------------------------------------------------
+
+    private List<Map<String, Object>> buildSeries(
+            String scopeType, Long scopeId,
+            List<String> xAxis, List<LocalDate[]> periods, boolean hasChain,
+            boolean isStation, boolean isBrigade, boolean isManager,
+            Long userDeptId, LoginUser loginUser) {
+
+        int currentIdx = periods.size() - 1;
+
+        if ("MANAGER".equals(scopeType) && scopeId != null) {
+            List<Integer> counts = countByPeriods(periods, r -> countCompletedByDepartmentId(scopeId, r[0], r[1]));
+            return Collections.singletonList(
+                    buildSeriesItem(getDeptName(scopeId), scopeId, null, counts, currentIdx, hasChain));
+
+        } else if ("USER".equals(scopeType) && scopeId != null) {
+            List<Integer> counts = countByPeriods(periods, r -> countCompletedByUserId(scopeId, r[0], r[1]));
+            return Collections.singletonList(
+                    buildSeriesItem("用户" + scopeId, null, scopeId, counts, currentIdx, hasChain));
+
+        } else if ("BRIGADE".equals(scopeType) && scopeId != null) {
+            return buildBrigadeSeriesList(scopeId, periods, hasChain, currentIdx);
+
+        } else if ("TEAM".equals(scopeType) && scopeId != null) {
+            List<Integer> counts = countByPeriods(periods, r -> countCompletedByDepartmentId(scopeId, r[0], r[1]));
+            return Collections.singletonList(
+                    buildSeriesItem(getDeptName(scopeId), scopeId, null, counts, currentIdx, hasChain));
+
+        } else {
+            Long stationDeptId = ("STATION".equals(scopeType) && scopeId != null) ? scopeId : userDeptId;
+            if (isStation || "STATION".equals(scopeType)) {
+                return buildStationSeriesList(stationDeptId, periods, hasChain, currentIdx);
+            } else if (isBrigade) {
+                return buildBrigadeSeriesList(userDeptId, periods, hasChain, currentIdx);
+            } else {
+                // 主管：本主管室单条 series
+                String deptName = loginUser.getUser().getDept() != null
+                        ? loginUser.getUser().getDept().getDeptName() : "本主管";
+                List<Integer> counts = countByPeriods(periods,
+                        r -> countCompletedByDepartmentId(userDeptId, r[0], r[1]));
+                return Collections.singletonList(
+                        buildSeriesItem(deptName, userDeptId, null, counts, currentIdx, hasChain));
+            }
+        }
+    }
+
+    /**
+     * 站长视角：各大队独立 series + 全站汇总
+     */
+    private List<Map<String, Object>> buildStationSeriesList(
+            Long stationDeptId, List<LocalDate[]> periods, boolean hasChain, int currentIdx) {
+
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(stationDeptId);
+        if (subDepts == null) subDepts = Collections.emptyList();
+        List<SysDept> brigades = subDepts.stream()
+                .filter(d -> stationDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                .collect(Collectors.toList());
+
+        List<Map<String, Object>> series = new ArrayList<>();
+        int[] stationTotals = new int[periods.size()];
+
+        for (SysDept brigade : brigades) {
+            List<Integer> counts = countByPeriods(periods,
+                    r -> countCompletedByBrigadeId(brigade.getDeptId(), r[0], r[1]));
+            for (int i = 0; i < counts.size(); i++) stationTotals[i] += counts.get(i);
+            series.add(buildSeriesItem(brigade.getDeptName(), brigade.getDeptId(), null, counts, currentIdx, hasChain));
+        }
+
+        List<Integer> totalCounts = new ArrayList<>();
+        for (int c : stationTotals) totalCounts.add(c);
+        series.add(buildSeriesItem("全站", null, null, totalCounts, currentIdx, hasChain));
+        return series;
+    }
+
+    /**
+     * 大队视角：各主管独立 series
+     */
+    private List<Map<String, Object>> buildBrigadeSeriesList(
+            Long brigadeId, List<LocalDate[]> periods, boolean hasChain, int currentIdx) {
+
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(brigadeId);
+        if (subDepts == null) subDepts = Collections.emptyList();
+        List<SysDept> managers = subDepts.stream()
+                .filter(d -> brigadeId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                .collect(Collectors.toList());
+
+        List<Map<String, Object>> series = new ArrayList<>();
+        for (SysDept manager : managers) {
+            List<Integer> counts = countByPeriods(periods,
+                    r -> countCompletedByDepartmentId(manager.getDeptId(), r[0], r[1]));
+            series.add(buildSeriesItem(manager.getDeptName(), manager.getDeptId(), null, counts, currentIdx, hasChain));
+        }
+        return series;
+    }
+
+    // -------------------------------------------------------------------------
+    // series item 构建
+    // -------------------------------------------------------------------------
+
+    /**
+     * 构建单条 series
+     *
+     * @param counts     各周期完成数，顺序与 xAxis 对应
+     * @param currentIdx 当期在 counts 中的下标（最后一个）
+     * @param hasChain   是否计算环比
+     */
+    private Map<String, Object> buildSeriesItem(String name, Long deptId, Long userId,
+                                                 List<Integer> counts, int currentIdx, boolean hasChain) {
+        int currentVal = counts.get(currentIdx);
+        int yoyVal = counts.get(0);
+        Integer prevVal = hasChain ? counts.get(1) : null;
+
+        Map<String, Object> s = new LinkedHashMap<>();
+        s.put("name", name);
+        if (deptId != null) s.put("deptId", deptId);
+        if (userId != null) s.put("userId", userId);
+        s.put("data", counts);
+        s.put("yoyRate", calcRate(currentVal, yoyVal));
+        s.put("chainRatio", prevVal != null ? calcRate(currentVal, prevVal) : null);
+        return s;
+    }
+
+    // -------------------------------------------------------------------------
+    // 统计辅助
+    // -------------------------------------------------------------------------
+
+    @FunctionalInterface
+    interface PeriodCounter {
+        int count(LocalDate[] range);
+    }
+
+    private List<Integer> countByPeriods(List<LocalDate[]> periods, PeriodCounter counter) {
+        List<Integer> result = new ArrayList<>();
+        for (LocalDate[] range : periods) {
+            result.add(counter.count(range));
+        }
+        return result;
+    }
+
+    private int countCompletedByDepartmentId(Long deptId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> w = new LambdaQueryWrapper<>();
+        w.eq(DailyTask::getDtDepartmentId, deptId);
+        w.eq(DailyTask::getDtStatus, "COMPLETED");
+        w.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        w.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        w.eq(DailyTask::getDelStatus, 0);
+        return Math.toIntExact(dailyTaskMapper.selectCount(w));
+    }
+
+    private int countCompletedByUserId(Long userId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> w = new LambdaQueryWrapper<>();
+        w.eq(DailyTask::getDtUserId, userId);
+        w.eq(DailyTask::getDtStatus, "COMPLETED");
+        w.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        w.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        w.eq(DailyTask::getDelStatus, 0);
+        return Math.toIntExact(dailyTaskMapper.selectCount(w));
+    }
+
+    private int countCompletedByBrigadeId(Long brigadeId, LocalDate start, LocalDate end) {
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(brigadeId);
+        if (subDepts == null) subDepts = Collections.emptyList();
+        Set<Long> managerIds = subDepts.stream()
+                .filter(d -> brigadeId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                .map(SysDept::getDeptId)
+                .collect(Collectors.toSet());
+        if (managerIds.isEmpty()) return 0;
+        LambdaQueryWrapper<DailyTask> w = new LambdaQueryWrapper<>();
+        w.in(DailyTask::getDtDepartmentId, managerIds);
+        w.eq(DailyTask::getDtStatus, "COMPLETED");
+        w.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        w.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        w.eq(DailyTask::getDelStatus, 0);
+        return Math.toIntExact(dailyTaskMapper.selectCount(w));
+    }
+
+    private String getDeptName(Long deptId) {
+        SysDept dept = sysDeptMapper.selectDeptById(deptId);
+        return dept != null ? dept.getDeptName() : "部门" + deptId;
+    }
+
+    private BigDecimal calcRate(int current, int base) {
+        if (base == 0) return null;
+        return BigDecimal.valueOf(current - base)
+                .multiply(BigDecimal.valueOf(100))
+                .divide(BigDecimal.valueOf(base), 2, RoundingMode.HALF_UP);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/DailyExamController.java

@@ -0,0 +1,513 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.core.domain.SysAnalysisReportParamDto;
+import com.sundot.airport.common.utils.DateRangeQueryUtils;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.exam.adapter.DailyTaskToExamAdapter;
+import com.sundot.airport.exam.common.ClientTypeConstant;
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.common.PageData;
+import com.sundot.airport.exam.domain.DailyTask;
+import com.sundot.airport.exam.domain.DailyTaskDetail;
+import com.sundot.airport.exam.dto.SubmitAnswerDTO;
+import com.sundot.airport.exam.dto.SubmitResultDTO;
+import com.sundot.airport.exam.logic.eighteen.model.params.ExamRecAddParam;
+import com.sundot.airport.exam.logic.eighteen.model.params.Get18ExamIntroParams;
+import com.sundot.airport.exam.logic.eighteen.model.params.SubmitExamParam;
+import com.sundot.airport.exam.logic.eighteen.model.result.ExamGetResult;
+import com.sundot.airport.exam.logic.eighteen.model.result.Get18ExamIntroResult;
+import com.sundot.airport.exam.logic.eighteen.model.result.SubmitExamResult;
+import com.sundot.airport.exam.logic.eighteen.model.result.subresult.ItemIn18ExamRecordListResult;
+import com.sundot.airport.exam.mapper.DailyTaskDetailMapper;
+import com.sundot.airport.exam.mapper.DailyTaskMapper;
+import com.sundot.airport.exam.service.IDailyAnswerService;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <b>功能名：</b>DailyExamController<br>
+ * <b>说明：</b> 每日抽问抽答接口控制层（兼容十八大考试格式） <br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ * <b>修改履历：</b><br>
+ *
+ * @author 2025-01-16
+ */
+@RestController
+@RequestMapping("/v1/cs/app/daily-exam")
+public class DailyExamController {
+
+    private static final Logger log = LoggerFactory.getLogger(DailyExamController.class);
+
+    @Autowired
+    private DailyTaskMapper dailyTaskMapper;
+
+    @Autowired
+    private DailyTaskDetailMapper dailyTaskDetailMapper;
+
+    @Autowired
+    private IDailyAnswerService dailyAnswerService;
+
+    @Autowired
+    private DailyTaskToExamAdapter dailyTaskAdapter;
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    /**
+     * <b>方法名: </b> getExamIntro <br>
+     * <b>说明: </b> 查询考试基本信息（兼容接口，实际返回当日任务信息） <br>
+     *
+     * @param param Get18ExamIntroParams 查询考试基本信息参数类
+     * @return HttpResult<Get18ExamIntroResult>
+     * <b>修改履历: </b>
+     * @author 2025-01-16
+     */
+    @PostMapping("/get_exam_intro")
+    public HttpResult<Get18ExamIntroResult> getExamIntro(@Validated @RequestBody Get18ExamIntroParams param) {
+        log.info("获取每日任务基本信息: userId={}", SecurityUtils.getUserId());
+
+        // 构造返回结果（固定信息）
+        Get18ExamIntroResult result = new Get18ExamIntroResult();
+        result.setExId("DAILY_TASK");
+        result.setExName("每日抽问抽答");
+        result.setExDetailImg("");
+        result.setExBgImg("");
+
+        return HttpResult.success(result);
+    }
+
+    /**
+     * <b>方法名: </b> applyExam <br>
+     * <b>说明: </b> 开始答题（获取今日待完成任务） <br>
+     *
+     * @param token java.lang.String token信息
+     * @param param com.sundot.airport.exam.logic.eighteen.model.params.ExamRecAddParam 获取考试信息和试题请求参数
+     * @return com.sundot.airport.exam.common.HttpResult<com.sundot.airport.exam.logic.eighteen.model.result.ExamGetResult><br>
+     * <b>修改履历: </b>
+     * @author 2025-01-16
+     */
+    @PostMapping("/get_exam")
+    public HttpResult<ExamGetResult> applyExam(
+            @RequestHeader(value = "Authorization", required = true) String token,
+            @Validated @RequestBody ExamRecAddParam param) {
+
+        Long userId = SecurityUtils.getUserId();
+        log.info("用户申请每日答题: userId={}, param={}", userId, param);
+
+        try {
+            // 1. 查询今日待完成任务
+            LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(DailyTask::getDtUserId, userId);
+            wrapper.eq(DailyTask::getDtStatus, "PENDING");
+            wrapper.eq(DailyTask::getDelStatus, 0);
+            wrapper.orderByAsc(DailyTask::getCreateTime);
+            wrapper.last("LIMIT 1");
+
+            DailyTask task = dailyTaskMapper.selectOne(wrapper);
+
+            if (task == null) {
+                log.warn("用户今日无待完成任务: userId={}", userId);
+                return HttpResult.error("今日暂无答题任务");
+            }
+
+            // 2. 更新任务状态为答题中
+            task.setDtStatus("IN_PROGRESS");
+            task.setDtStartTime(new java.util.Date());
+            dailyTaskMapper.updateById(task);
+
+            // 3. 查询任务明细（题目列表）
+            LambdaQueryWrapper<DailyTaskDetail> detailWrapper = new LambdaQueryWrapper<>();
+            detailWrapper.eq(DailyTaskDetail::getDtdTaskId, task.getDtId());
+            detailWrapper.eq(DailyTaskDetail::getDelStatus, 0);
+            detailWrapper.orderByAsc(DailyTaskDetail::getDtdQuestionNo);
+            List<DailyTaskDetail> details = dailyTaskDetailMapper.selectList(detailWrapper);
+
+            // 4. 转换为考试格式返回
+            ExamGetResult result = dailyTaskAdapter.convertDailyTaskToExam(task, details);
+
+            log.info("每日答题获取成功: userId={}, taskId={}, questionCount={}",
+                    userId, task.getDtId(), details.size());
+
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取每日答题失败: userId={}", userId, e);
+            return HttpResult.error("获取每日答题失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * <b>方法名: </b> getExamRecordList <br>
+     * <b>说明: </b> 查询测试记录列表（用户历史任务列表） <br>
+     *
+     * @return HttpResult<PageData < ItemIn18ExamRecordListResult>>
+     * <b>修改履历: </b>
+     * @author 2025-01-16
+     */
+    @PostMapping("/get_exam_record_list")
+    public HttpResult<PageData<ItemIn18ExamRecordListResult>> getExamRecordList() {
+        Long userId = SecurityUtils.getUserId();
+        log.info("查询用户任务记录列表: userId={}", userId);
+
+        try {
+            // 查询用户所有任务记录
+            LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(DailyTask::getDtUserId, userId);
+            wrapper.eq(DailyTask::getDelStatus, 0);
+            wrapper.orderByDesc(DailyTask::getDtBusinessDate);
+            wrapper.orderByDesc(DailyTask::getCreateTime);
+
+            List<DailyTask> tasks = dailyTaskMapper.selectList(wrapper);
+
+            // 转换为考试记录列表格式
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            List<ItemIn18ExamRecordListResult> results = new ArrayList<>();
+
+            for (DailyTask task : tasks) {
+                ItemIn18ExamRecordListResult item = new ItemIn18ExamRecordListResult();
+                item.setErId(task.getDtId());
+                item.setErExId("DAILY_TASK_" + task.getDtBusinessDate());
+                item.setErExName("每日抽问抽答");
+                item.setErScore(task.getDtTotalScore() != null ? task.getDtTotalScore().intValue() : 0);
+                item.setCreateTime(task.getCreateTime() != null ? sdf.format(task.getCreateTime()) : "");
+                item.setErExEnableCert(false); // 每日任务不启用证书
+                item.setGetCert(false);
+
+                results.add(item);
+            }
+
+            PageData<ItemIn18ExamRecordListResult> pageData = new PageData<>();
+            pageData.setList(results);
+            pageData.setTotal(results.size());
+
+            return HttpResult.success(pageData);
+
+        } catch (Exception e) {
+            log.error("查询任务记录列表失败: userId={}", userId, e);
+            return HttpResult.error("查询记录列表失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * <b>方法名: </b> getExamRecord <br>
+     * <b>说明: </b> 查询测试记录详情（任务详情） <br>
+     *
+     * @param erId 任务ID
+     * @return HttpResult
+     * <b>修改履历: </b>
+     * @author 2025-01-16
+     */
+    @PostMapping("/get_exam_record")
+    public HttpResult getExamRecord(@RequestParam String erId) {
+        Long userId = SecurityUtils.getUserId();
+        log.info("查询任务记录详情: userId={}, taskId={}", userId, erId);
+
+        try {
+            // 查询任务主记录
+            LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+            taskWrapper.eq(DailyTask::getDtId, erId);
+            taskWrapper.eq(DailyTask::getDelStatus, 0);
+            DailyTask task = dailyTaskMapper.selectOne(taskWrapper);
+
+            if (task == null) {
+                return HttpResult.error("任务不存在");
+            }
+
+            // 验证权限
+            if (!task.getDtUserId().equals(userId)) {
+                return HttpResult.error("无权查看该任务");
+            }
+
+            // 查询任务明细
+            LambdaQueryWrapper<DailyTaskDetail> detailWrapper = new LambdaQueryWrapper<>();
+            detailWrapper.eq(DailyTaskDetail::getDtdTaskId, erId);
+            detailWrapper.eq(DailyTaskDetail::getDelStatus, 0);
+            detailWrapper.orderByAsc(DailyTaskDetail::getDtdQuestionNo);
+            List<DailyTaskDetail> details = dailyTaskDetailMapper.selectList(detailWrapper);
+
+            // 组装返回结果
+            Map<String, Object> data = new HashMap<>();
+            data.put("task", task);
+            data.put("details", details);
+
+            return HttpResult.success(data);
+
+        } catch (Exception e) {
+            log.error("查询任务记录详情失败: userId={}, taskId={}", userId, erId, e);
+            return HttpResult.error("查询记录详情失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * <b>方法名: </b> submitExam <br>
+     * <b>说明: </b> 提交考试答案 <br>
+     *
+     * @param param SubmitExamParam 提交考试参数类
+     * @return HttpResult<SubmitExamResult>
+     * <b>修改履历: </b>
+     * @author 2025-01-16
+     */
+    @PostMapping("/submit_exam")
+    public HttpResult<SubmitExamResult> submitExam(@Validated @RequestBody SubmitExamParam param) {
+        Long userId = SecurityUtils.getUserId();
+        log.info("提交每日答题: userId={}, param={}", userId, param);
+
+        try {
+            // 1. 转换参数格式
+            SubmitAnswerDTO taskDto = dailyTaskAdapter.convertExamParamToTaskSubmit(param);
+
+            // 2. 调用答题服务提交
+            SubmitResultDTO taskResult = dailyAnswerService.submitAnswer(userId, taskDto);
+
+            // 3. 转换为考试提交结果格式
+            SubmitExamResult examResult = dailyTaskAdapter.convertTaskResultToExamResult(taskResult);
+
+            log.info("每日答题提交成功: userId={}, taskId={}, score={}",
+                    userId, taskResult.getTaskId(), taskResult.getTotalScore());
+
+            return HttpResult.success(examResult);
+
+        } catch (Exception e) {
+            log.error("提交每日答题失败: userId={}, erId={}", userId, param.getErId(), e);
+            return HttpResult.error("提交答题失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 抽问抽答完成趋势
+     * 美兰4级架构：STATION > 大队(BRIGADE) > 主管(MANAGER) > 班组(TEAMS)
+     * 站长/管理员/质检科：各大队完成趋势折线
+     * 大队长（经理/行政）：本大队各主管完成趋势折线
+     * 主管：本主管室完成趋势（单条折线）
+     * 班组长/安检员：show=false
+     *
+     * @param timeType  时间类型：year/month/custom，默认 month
+     * @param startDate 自定义开始日期（yyyy-MM-dd），timeType=custom 时有效
+     * @param endDate   自定义结束日期（yyyy-MM-dd），timeType=custom 时有效
+     */
+    @GetMapping("/completion-trend")
+    public HttpResult<Map<String, Object>> getCompletionTrend(
+            @RequestParam(required = false, defaultValue = "month") String timeType,
+            @RequestParam(required = false) String startDate,
+            @RequestParam(required = false) String endDate) {
+
+        try {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            List<String> roleKeys = loginUser.getUser().getRoles().stream()
+                    .map(SysRole::getRoleKey).collect(Collectors.toList());
+            Long userDeptId = loginUser.getDeptId();
+            Long userId = loginUser.getUserId();
+
+            boolean isStation = userId == 1L
+                    || roleKeys.contains(RoleTypeEnum.admin.getCode())
+                    || roleKeys.contains(RoleTypeEnum.test.getCode())
+                    || roleKeys.contains(RoleTypeEnum.zhijianke.getCode());
+            boolean isBrigade = !isStation && (roleKeys.contains(RoleTypeEnum.jingli.getCode())
+                    || roleKeys.contains(RoleTypeEnum.xingzheng.getCode()));
+            boolean isKezhang = !isStation && !isBrigade && roleKeys.contains(RoleTypeEnum.kezhang.getCode());
+
+            // 班组长及以下不显示此tab
+            if (!isStation && !isBrigade && !isKezhang) {
+                Map<String, Object> noShow = new HashMap<>();
+                noShow.put("show", false);
+                return HttpResult.success(noShow);
+            }
+
+            LocalDate[] range = resolveDateRange(timeType, startDate, endDate);
+            LocalDate start = range[0];
+            LocalDate end = range[1];
+            boolean byMonth = "year".equals(timeType);
+            List<String> xAxis = buildXAxis(start, end, byMonth);
+            List<Map<String, Object>> series = new ArrayList<>();
+
+            if (isStation) {
+                // 站长：查该站所有子部门，按大队分组
+                List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(userDeptId);
+                if (subDepts == null) subDepts = Collections.emptyList();
+
+                // 大队（站的直接下级）
+                List<SysDept> brigadeDepts = subDepts.stream()
+                        .filter(d -> userDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                        .collect(Collectors.toList());
+
+                // 构建 主管deptId -> 所属大队deptId 的映射
+                Map<Long, Long> managerToBrigadeId = new HashMap<>();
+                for (SysDept d : subDepts) {
+                    if ("0".equals(d.getDelFlag()) && d.getParentId() != null && !userDeptId.equals(d.getParentId())) {
+                        // 非直接下级，其parentId为某个大队，记录映射（主管级别）
+                        managerToBrigadeId.put(d.getDeptId(), d.getParentId());
+                    }
+                }
+
+                // 查全站所有任务
+                Set<Long> allDeptIds = new HashSet<>();
+                allDeptIds.add(userDeptId);
+                subDepts.forEach(d -> allDeptIds.add(d.getDeptId()));
+                List<DailyTask> allTasks = queryTasksByDeptIds(allDeptIds, start, end);
+
+                // 按大队分组生成折线
+                for (SysDept brigade : brigadeDepts) {
+                    Long brigadeId = brigade.getDeptId();
+                    List<DailyTask> brigadeTasks = allTasks.stream()
+                            .filter(t -> {
+                                Long managerId = t.getDtDepartmentId();
+                                if (managerId == null) return false;
+                                Long parentBrigadeId = managerToBrigadeId.get(managerId);
+                                return brigadeId.equals(parentBrigadeId);
+                            })
+                            .collect(Collectors.toList());
+                    Map<String, Object> item = new LinkedHashMap<>();
+                    item.put("name", brigade.getDeptName());
+                    item.put("deptId", brigadeId);
+                    item.put("data", buildSeriesData(xAxis, brigadeTasks, byMonth));
+                    series.add(item);
+                }
+
+            } else if (isBrigade) {
+                // 大队长：查本大队下各主管的任务
+                List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(userDeptId);
+                if (subDepts == null) subDepts = Collections.emptyList();
+
+                // 主管（大队的直接下级）
+                List<SysDept> managerDepts = subDepts.stream()
+                        .filter(d -> userDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                        .collect(Collectors.toList());
+
+                for (SysDept manager : managerDepts) {
+                    List<DailyTask> tasks = queryTasksByDepartmentId(manager.getDeptId(), start, end);
+                    Map<String, Object> item = new LinkedHashMap<>();
+                    item.put("name", manager.getDeptName());
+                    item.put("deptId", manager.getDeptId());
+                    item.put("data", buildSeriesData(xAxis, tasks, byMonth));
+                    series.add(item);
+                }
+
+            } else {
+                // 主管：本主管室所有任务，一条折线
+                List<DailyTask> tasks = queryTasksByDepartmentId(userDeptId, start, end);
+                String deptName = loginUser.getUser().getDept() != null
+                        ? loginUser.getUser().getDept().getDeptName() : "本主管";
+                Map<String, Object> item = new LinkedHashMap<>();
+                item.put("name", deptName);
+                item.put("deptId", userDeptId);
+                item.put("data", buildSeriesData(xAxis, tasks, byMonth));
+                series.add(item);
+            }
+
+            Map<String, Object> result = new LinkedHashMap<>();
+            result.put("show", true);
+            result.put("xAxis", xAxis);
+            result.put("series", series);
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取抽问抽答完成趋势失败", e);
+            return HttpResult.error("获取完成趋势失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 根据 timeType 计算起止日期
+     * year: 当年全年；month: 当月；custom: 自定义范围
+     */
+    private LocalDate[] resolveDateRange(String timeType, String startDate, String endDate) {
+        LocalDate today = LocalDate.now();
+        LocalDate start;
+        LocalDate end = today;
+        switch (timeType == null ? "month" : timeType) {
+            case "year":
+                start = today.withDayOfYear(1);
+                end = today.withMonth(12).withDayOfMonth(31);
+                break;
+            case "custom":
+                start = (startDate != null) ? LocalDate.parse(startDate) : today.withDayOfMonth(1);
+                end = (endDate != null) ? LocalDate.parse(endDate) : today;
+                break;
+            default: // month
+                start = today.withDayOfMonth(1);
+                break;
+        }
+        return new LocalDate[]{start, end};
+    }
+
+    /**
+     * 生成X轴标签列表
+     * byMonth=true：每月一个标签（格式 yyyy-MM）；false：每天一个标签（格式 yyyy-MM-dd）
+     */
+    private List<String> buildXAxis(LocalDate start, LocalDate end, boolean byMonth) {
+        List<String> xAxis = new ArrayList<>();
+        if (byMonth) {
+            LocalDate cursor = start.withDayOfMonth(1);
+            LocalDate endMonth = end.withDayOfMonth(1);
+            while (!cursor.isAfter(endMonth)) {
+                xAxis.add(cursor.format(DateTimeFormatter.ofPattern("yyyy-MM")));
+                cursor = cursor.plusMonths(1);
+            }
+        } else {
+            LocalDate cursor = start;
+            while (!cursor.isAfter(end)) {
+                xAxis.add(cursor.toString());
+                cursor = cursor.plusDays(1);
+            }
+        }
+        return xAxis;
+    }
+
+    /**
+     * 构建某条折线的数据数组，与 xAxis 对齐
+     */
+    private List<Integer> buildSeriesData(List<String> xAxis, List<DailyTask> tasks, boolean byMonth) {
+        SimpleDateFormat sdf = new SimpleDateFormat(byMonth ? "yyyy-MM" : "yyyy-MM-dd");
+        Map<String, Long> countMap = tasks.stream()
+                .filter(t -> "COMPLETED".equals(t.getDtStatus()) && t.getDtBusinessDate() != null)
+                .collect(Collectors.groupingBy(
+                        t -> sdf.format(t.getDtBusinessDate()),
+                        Collectors.counting()));
+        List<Integer> data = new ArrayList<>();
+        for (String label : xAxis) {
+            data.add(countMap.getOrDefault(label, 0L).intValue());
+        }
+        return data;
+    }
+
+    /**
+     * 按部门ID集合查询任务（用于站长视角：通过dtDeptId匹配所有子部门）
+     */
+    private List<DailyTask> queryTasksByDeptIds(Set<Long> deptIds, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(DailyTask::getDtDeptId, deptIds);
+        wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        wrapper.eq(DailyTask::getDelStatus, 0);
+        return dailyTaskMapper.selectList(wrapper);
+    }
+
+    /**
+     * 按主管ID查询任务（通过dtDepartmentId匹配）
+     */
+    private List<DailyTask> queryTasksByDepartmentId(Long departmentId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DailyTask::getDtDepartmentId, departmentId);
+        wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        wrapper.eq(DailyTask::getDelStatus, 0);
+        return dailyTaskMapper.selectList(wrapper);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/DailyExamWrongAnalysisController.java

@@ -0,0 +1,755 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.core.domain.SysAnalysisReportParamDto;
+import com.sundot.airport.common.utils.DateRangeQueryUtils;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.common.service.QuesCatService;
+import com.sundot.airport.exam.domain.DailyTask;
+import com.sundot.airport.exam.domain.DailyTaskDetail;
+import com.sundot.airport.exam.domain.QuesCat;
+import com.sundot.airport.exam.mapper.DailyTaskDetailMapper;
+import com.sundot.airport.exam.mapper.DailyTaskMapper;
+import com.sundot.airport.system.domain.BaseCheckCategory;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+import com.sundot.airport.system.service.IBaseCheckCategoryService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 抽问抽答错题分析接口（美兰4级架构适配版）
+ * <p>
+ * 美兰组织架构：STATION（安检站）> BRIGADE（大队）> MANAGER（主管）> TEAMS（班组）
+ * <p>
+ * 接口1: GET /wrong-analysis/overview      总体问题分布（饼图，所有角色）
+ * 接口2: GET /wrong-analysis/radar         问题分布对比（雷达图，仅站长）
+ * 接口3: GET /wrong-analysis/category-detail  大类详情
+ *   - 站长：各大队对比表格 + 各大队趋势
+ *   - 大队长：各主管对比表格 + 各主管趋势
+ *   - 主管：本主管各小类甜甜圈 + 本主管趋势
+ *   - 班组长及以下：show=false
+ */
+@RestController
+@RequestMapping("/v1/cs/app/daily-exam/wrong-analysis")
+public class DailyExamWrongAnalysisController {
+
+    private static final Logger log = LoggerFactory.getLogger(DailyExamWrongAnalysisController.class);
+
+    @Autowired
+    private DailyTaskMapper dailyTaskMapper;
+
+    @Autowired
+    private DailyTaskDetailMapper dailyTaskDetailMapper;
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    @Autowired
+    private QuesCatService quesCatService;
+
+    @Autowired
+    private IBaseCheckCategoryService baseCheckCategoryService;
+
+    // =====================================================================
+    // 接口1：总体问题分布（饼图）
+    // =====================================================================
+
+    /**
+     * 总体问题分布（按大类统计错题数）
+     * 站长/管理员/质检科：全站；大队长：本大队；主管：本主管室；班组长：本班组
+     *
+     * @param timeType  year/month/custom，默认 month
+     * @param startDate 自定义开始日期 yyyy-MM-dd
+     * @param endDate   自定义结束日期 yyyy-MM-dd
+     */
+    @GetMapping("/overview")
+    public HttpResult<Map<String, Object>> getOverview(
+            @RequestParam(required = false, defaultValue = "month") String timeType,
+            @RequestParam(required = false) String startDate,
+            @RequestParam(required = false) String endDate) {
+
+        try {
+            RoleInfo role = getRoleInfo();
+            LocalDate[] range = resolveDateRange(timeType, startDate, endDate);
+
+            List<DailyTaskDetail> errorDetails = getErrorDetails(role, range[0], range[1]);
+
+            Map<String, BaseCheckCategory> qcIdToLevel1 = buildQcIdToLevel1Map(errorDetails);
+
+            Map<Long, long[]> countByCategory = new LinkedHashMap<>();
+            Map<Long, String> categoryNames = new LinkedHashMap<>();
+
+            for (DailyTaskDetail detail : errorDetails) {
+                BaseCheckCategory cat = qcIdToLevel1.get(detail.getDtdModuleId());
+                if (cat != null) {
+                    countByCategory.merge(cat.getId(), new long[]{1, cat.getOrderNum() != null ? cat.getOrderNum() : 99},
+                            (a, b) -> new long[]{a[0] + 1, a[1]});
+                    categoryNames.put(cat.getId(), cat.getName());
+                }
+            }
+
+            List<Map<String, Object>> categories = countByCategory.entrySet().stream()
+                    .sorted(Comparator.comparingLong(e -> e.getValue()[1]))
+                    .map(e -> {
+                        Map<String, Object> item = new LinkedHashMap<>();
+                        item.put("id", e.getKey());
+                        item.put("name", categoryNames.get(e.getKey()));
+                        item.put("count", e.getValue()[0]);
+                        return item;
+                    })
+                    .collect(Collectors.toList());
+
+            Map<String, Object> result = new LinkedHashMap<>();
+            result.put("categories", categories);
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取总体问题分布失败", e);
+            return HttpResult.error("获取总体问题分布失败：" + e.getMessage());
+        }
+    }
+
+    // =====================================================================
+    // 接口2：问题分布对比（雷达图，仅站长）
+    // =====================================================================
+
+    /**
+     * 问题分布对比雷达图（仅站长可见，各大队在各大类的错题数对比）
+     *
+     * @param timeType  year/month/custom，默认 month
+     * @param startDate 自定义开始日期
+     * @param endDate   自定义结束日期
+     */
+    @GetMapping("/radar")
+    public HttpResult<Map<String, Object>> getRadar(
+            @RequestParam(required = false, defaultValue = "month") String timeType,
+            @RequestParam(required = false) String startDate,
+            @RequestParam(required = false) String endDate) {
+
+        try {
+            RoleInfo role = getRoleInfo();
+            if (!role.isStation) {
+                Map<String, Object> noShow = new HashMap<>();
+                noShow.put("show", false);
+                return HttpResult.success(noShow);
+            }
+
+            LocalDate[] range = resolveDateRange(timeType, startDate, endDate);
+
+            // 查询所有大类，作为雷达图的维度
+            BaseCheckCategory level1Query = new BaseCheckCategory();
+            level1Query.setLevel(1);
+            List<BaseCheckCategory> level1Categories = baseCheckCategoryService.selectBaseCheckCategoryList(level1Query);
+            level1Categories.sort(Comparator.comparingInt(c -> c.getOrderNum() != null ? c.getOrderNum() : 99));
+
+            List<String> indicators = level1Categories.stream()
+                    .map(BaseCheckCategory::getName)
+                    .collect(Collectors.toList());
+            List<Long> indicatorIds = level1Categories.stream()
+                    .map(BaseCheckCategory::getId)
+                    .collect(Collectors.toList());
+
+            // 获取站下各大队（直接下级）
+            List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(role.userDeptId);
+            List<SysDept> brigadeDepts = subDepts == null ? Collections.emptyList() :
+                    subDepts.stream()
+                            .filter(d -> role.userDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                            .collect(Collectors.toList());
+
+            // 为每个大队构建一条雷达折线
+            List<Map<String, Object>> series = new ArrayList<>();
+            for (SysDept brigade : brigadeDepts) {
+                // 查该大队下所有主管的错误明细（通过dtDepartmentId匹配主管子部门）
+                List<DailyTaskDetail> details = getErrorDetailsBySubDepts(brigade.getDeptId(), range[0], range[1]);
+                Map<String, BaseCheckCategory> qcIdToLevel1 = buildQcIdToLevel1Map(details);
+
+                Map<Long, Long> countMap = details.stream()
+                        .filter(d -> qcIdToLevel1.get(d.getDtdModuleId()) != null)
+                        .collect(Collectors.groupingBy(
+                                d -> qcIdToLevel1.get(d.getDtdModuleId()).getId(),
+                                Collectors.counting()));
+
+                List<Long> data = indicatorIds.stream()
+                        .map(id -> countMap.getOrDefault(id, 0L))
+                        .collect(Collectors.toList());
+
+                Map<String, Object> seriesItem = new LinkedHashMap<>();
+                seriesItem.put("name", brigade.getDeptName());
+                seriesItem.put("deptId", brigade.getDeptId());
+                seriesItem.put("data", data);
+                series.add(seriesItem);
+            }
+
+            Map<String, Object> result = new LinkedHashMap<>();
+            result.put("show", true);
+            result.put("indicators", indicators);
+            result.put("series", series);
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取问题分布对比失败", e);
+            return HttpResult.error("获取问题分布对比失败：" + e.getMessage());
+        }
+    }
+
+    // =====================================================================
+    // 接口3：大类详情（站长/大队长/主管）
+    // =====================================================================
+
+    /**
+     * 大类详情 - 点击饼图某一块后展示该大类下的小类分布及趋势
+     * <p>
+     * 站长：各大队小类对比表 + 各大队按日趋势
+     * 大队长：各主管小类对比表 + 各主管按日趋势
+     * 主管：本主管各小类甜甜圈分布 + 本主管按日趋势
+     * 班组长及以下：show=false
+     *
+     * @param categoryId 大类ID（base_check_category.id，level=1）
+     * @param param      dateRangeQueryType=YEAR|QUARTER|MONTH，year，quarter，month
+     */
+    @GetMapping("/category-detail")
+    public HttpResult<Map<String, Object>> getCategoryDetail(
+            @RequestParam Long categoryId,
+            SysAnalysisReportParamDto param) {
+
+        try {
+            RoleInfo role = getRoleInfo();
+
+            if (!role.isStation && !role.isBrigade && !role.isKezhang) {
+                Map<String, Object> noShow = new HashMap<>();
+                noShow.put("show", false);
+                return HttpResult.success(noShow);
+            }
+
+            LocalDate[] range = resolveDateRange(param);
+
+            BaseCheckCategory level1Cat = baseCheckCategoryService.selectBaseCheckCategoryById(categoryId);
+            if (level1Cat == null) {
+                return HttpResult.error("未找到该分类");
+            }
+
+            BaseCheckCategory level2Query = new BaseCheckCategory();
+            level2Query.setParentId(categoryId);
+            level2Query.setLevel(2);
+            List<BaseCheckCategory> subCategories = baseCheckCategoryService.selectBaseCheckCategoryList(level2Query);
+            subCategories.sort(Comparator.comparingInt(c -> c.getOrderNum() != null ? c.getOrderNum() : 99));
+
+            List<String> subCatNames = subCategories.stream()
+                    .map(BaseCheckCategory::getName).collect(Collectors.toList());
+            Map<String, String> subCatNameToQcId = buildSubCatNameToQcIdMap(subCatNames);
+            Map<String, String> qcIdToSubCatName = new HashMap<>();
+            subCatNameToQcId.forEach((name, qcId) -> { if (qcId != null) qcIdToSubCatName.put(qcId, name); });
+
+            Map<String, Object> result = new LinkedHashMap<>();
+            result.put("show", true);
+            result.put("categoryId", categoryId);
+            result.put("categoryName", level1Cat.getName());
+
+            boolean byMonth = "YEAR".equals(param != null ? param.getDateRangeQueryType() : null);
+            List<String> xAxis = buildXAxis(range[0], range[1], byMonth);
+            SimpleDateFormat sdf = new SimpleDateFormat(byMonth ? "yyyy-MM" : "yyyy-MM-dd");
+
+            if (role.isStation) {
+                // ---- 站长视角：各大队对比 ----
+                List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(role.userDeptId);
+                List<SysDept> brigadeDepts = subDepts == null ? Collections.emptyList() :
+                        subDepts.stream()
+                                .filter(d -> role.userDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                                .collect(Collectors.toList());
+
+                // 查各大队错误明细（按qcId过滤）
+                Map<Long, List<DailyTaskDetail>> detailsByBrigade = new LinkedHashMap<>();
+                for (SysDept brigade : brigadeDepts) {
+                    List<DailyTaskDetail> details = getErrorDetailsBySubDeptsAndQcIds(
+                            brigade.getDeptId(), new HashSet<>(qcIdToSubCatName.keySet()), range[0], range[1]);
+                    detailsByBrigade.put(brigade.getDeptId(), details);
+                }
+
+                // 表格数据：行=小类，列=各大队
+                List<Map<String, Object>> tableRows = new ArrayList<>();
+                for (String subCatName : subCatNames) {
+                    String qcId = subCatNameToQcId.get(subCatName);
+                    Map<String, Object> row = new LinkedHashMap<>();
+                    row.put("subCategory", subCatName);
+                    List<Long> deptCounts = new ArrayList<>();
+                    for (SysDept brigade : brigadeDepts) {
+                        List<DailyTaskDetail> details = detailsByBrigade.get(brigade.getDeptId());
+                        long cnt = details == null ? 0 : details.stream()
+                                .filter(d -> qcId != null && qcId.equals(d.getDtdModuleId()))
+                                .count();
+                        deptCounts.add(cnt);
+                    }
+                    row.put("counts", deptCounts);
+                    tableRows.add(row);
+                }
+
+                List<String> deptNames = brigadeDepts.stream()
+                        .map(SysDept::getDeptName).collect(Collectors.toList());
+
+                Map<String, Object> table = new LinkedHashMap<>();
+                table.put("depts", deptNames);
+                table.put("rows", tableRows);
+                result.put("table", table);
+
+                // 趋势数据（各大队按日/月错题数）
+                List<Map<String, Object>> trendSeries = new ArrayList<>();
+                for (SysDept brigade : brigadeDepts) {
+                    List<DailyTaskDetail> details = detailsByBrigade.get(brigade.getDeptId());
+                    List<Integer> data = buildTrendData(xAxis, details, sdf);
+                    Map<String, Object> s = new LinkedHashMap<>();
+                    s.put("name", brigade.getDeptName());
+                    s.put("deptId", brigade.getDeptId());
+                    s.put("data", data);
+                    trendSeries.add(s);
+                }
+                Map<String, Object> trend = new LinkedHashMap<>();
+                trend.put("xAxis", xAxis);
+                trend.put("series", trendSeries);
+                result.put("trend", trend);
+
+            } else if (role.isBrigade) {
+                // ---- 大队长视角：各主管对比 ----
+                List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(role.userDeptId);
+                List<SysDept> managerDepts = subDepts == null ? Collections.emptyList() :
+                        subDepts.stream()
+                                .filter(d -> role.userDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                                .collect(Collectors.toList());
+
+                // 查各主管错误明细（按qcId过滤）
+                Map<Long, List<DailyTaskDetail>> detailsByManager = new LinkedHashMap<>();
+                for (SysDept manager : managerDepts) {
+                    List<DailyTaskDetail> details = getErrorDetailsByDepartmentIdAndQcIds(
+                            manager.getDeptId(), new HashSet<>(qcIdToSubCatName.keySet()), range[0], range[1]);
+                    detailsByManager.put(manager.getDeptId(), details);
+                }
+
+                // 表格数据：行=小类，列=各主管
+                List<Map<String, Object>> tableRows = new ArrayList<>();
+                for (String subCatName : subCatNames) {
+                    String qcId = subCatNameToQcId.get(subCatName);
+                    Map<String, Object> row = new LinkedHashMap<>();
+                    row.put("subCategory", subCatName);
+                    List<Long> deptCounts = new ArrayList<>();
+                    for (SysDept manager : managerDepts) {
+                        List<DailyTaskDetail> details = detailsByManager.get(manager.getDeptId());
+                        long cnt = details == null ? 0 : details.stream()
+                                .filter(d -> qcId != null && qcId.equals(d.getDtdModuleId()))
+                                .count();
+                        deptCounts.add(cnt);
+                    }
+                    row.put("counts", deptCounts);
+                    tableRows.add(row);
+                }
+
+                List<String> deptNames = managerDepts.stream()
+                        .map(SysDept::getDeptName).collect(Collectors.toList());
+
+                Map<String, Object> table = new LinkedHashMap<>();
+                table.put("depts", deptNames);
+                table.put("rows", tableRows);
+                result.put("table", table);
+
+                // 趋势数据（各主管按日/月错题数）
+                List<Map<String, Object>> trendSeries = new ArrayList<>();
+                for (SysDept manager : managerDepts) {
+                    List<DailyTaskDetail> details = detailsByManager.get(manager.getDeptId());
+                    List<Integer> data = buildTrendData(xAxis, details, sdf);
+                    Map<String, Object> s = new LinkedHashMap<>();
+                    s.put("name", manager.getDeptName());
+                    s.put("deptId", manager.getDeptId());
+                    s.put("data", data);
+                    trendSeries.add(s);
+                }
+                Map<String, Object> trend = new LinkedHashMap<>();
+                trend.put("xAxis", xAxis);
+                trend.put("series", trendSeries);
+                result.put("trend", trend);
+
+            } else {
+                // ---- 主管视角：甜甜圈 + 趋势 ----
+                List<DailyTaskDetail> details = getErrorDetailsByDepartmentIdAndQcIds(
+                        role.userDeptId, new HashSet<>(qcIdToSubCatName.keySet()), range[0], range[1]);
+
+                Map<String, Long> qcIdCountMap = details.stream()
+                        .collect(Collectors.groupingBy(
+                                d -> d.getDtdModuleId() != null ? d.getDtdModuleId() : "",
+                                Collectors.counting()));
+
+                List<Map<String, Object>> donut = new ArrayList<>();
+                for (String subCatName : subCatNames) {
+                    String qcId = subCatNameToQcId.get(subCatName);
+                    Map<String, Object> item = new LinkedHashMap<>();
+                    item.put("name", subCatName);
+                    item.put("count", qcId != null ? qcIdCountMap.getOrDefault(qcId, 0L) : 0L);
+                    donut.add(item);
+                }
+                result.put("donut", donut);
+
+                String deptName = getDeptName(role.userDeptId);
+                List<Integer> trendData = buildTrendData(xAxis, details, sdf);
+                Map<String, Object> seriesItem = new LinkedHashMap<>();
+                seriesItem.put("name", deptName);
+                seriesItem.put("deptId", role.userDeptId);
+                seriesItem.put("data", trendData);
+
+                Map<String, Object> trend = new LinkedHashMap<>();
+                trend.put("xAxis", xAxis);
+                trend.put("series", Collections.singletonList(seriesItem));
+                result.put("trend", trend);
+            }
+
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取大类详情失败 categoryId={}", categoryId, e);
+            return HttpResult.error("获取大类详情失败：" + e.getMessage());
+        }
+    }
+
+    // =====================================================================
+    // 私有工具方法
+    // =====================================================================
+
+    /**
+     * 获取当前用户角色信息
+     * 美兰角色优先级：站长 > 大队长(经理/行政) > 主管 > 班组长 > 安检员
+     */
+    private RoleInfo getRoleInfo() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        List<String> roleKeys = loginUser.getUser().getRoles().stream()
+                .map(SysRole::getRoleKey).collect(Collectors.toList());
+        Long userDeptId = loginUser.getDeptId();
+        Long userId = loginUser.getUserId();
+
+        boolean isStation = userId == 1L
+                || roleKeys.contains(RoleTypeEnum.admin.getCode())
+                || roleKeys.contains(RoleTypeEnum.test.getCode())
+                || roleKeys.contains(RoleTypeEnum.zhijianke.getCode());
+        boolean isBrigade = !isStation && (roleKeys.contains(RoleTypeEnum.jingli.getCode())
+                || roleKeys.contains(RoleTypeEnum.xingzheng.getCode()));
+        boolean isKezhang = !isStation && !isBrigade && roleKeys.contains(RoleTypeEnum.kezhang.getCode());
+
+        RoleInfo info = new RoleInfo();
+        info.isStation = isStation;
+        info.isBrigade = isBrigade;
+        info.isKezhang = isKezhang;
+        info.userDeptId = userDeptId;
+        return info;
+    }
+
+    private static class RoleInfo {
+        boolean isStation;
+        boolean isBrigade;
+        boolean isKezhang;
+        Long userDeptId;
+    }
+
+    /**
+     * 根据角色获取错误答题明细
+     */
+    private List<DailyTaskDetail> getErrorDetails(RoleInfo role, LocalDate start, LocalDate end) {
+        if (role.isStation) {
+            // 站长：站下所有子部门的任务（dtDeptId匹配）
+            List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(role.userDeptId);
+            Set<Long> allDeptIds = new HashSet<>();
+            allDeptIds.add(role.userDeptId);
+            if (subDepts != null) {
+                subDepts.forEach(d -> allDeptIds.add(d.getDeptId()));
+            }
+            return getErrorDetailsByDeptIds(allDeptIds, start, end);
+        } else if (role.isBrigade) {
+            // 大队长：本大队下所有子部门的任务（dtDeptId匹配）
+            List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(role.userDeptId);
+            Set<Long> allDeptIds = new HashSet<>();
+            allDeptIds.add(role.userDeptId);
+            if (subDepts != null) {
+                subDepts.forEach(d -> allDeptIds.add(d.getDeptId()));
+            }
+            return getErrorDetailsByDeptIds(allDeptIds, start, end);
+        } else if (role.isKezhang) {
+            // 主管：本主管室（dtDepartmentId匹配）
+            return getErrorDetailsByDepartmentId(role.userDeptId, start, end);
+        } else {
+            // 班组长：本班组（dtDeptId匹配）
+            return getErrorDetailsByDeptId(role.userDeptId, start, end);
+        }
+    }
+
+    /**
+     * 按 dt_dept_id 集合查询错误明细
+     */
+    private List<DailyTaskDetail> getErrorDetailsByDeptIds(Set<Long> deptIds, LocalDate start, LocalDate end) {
+        if (deptIds == null || deptIds.isEmpty()) return Collections.emptyList();
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.in(DailyTask::getDtDeptId, deptIds);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    /**
+     * 按 dt_department_id（主管级别）查询错误明细
+     */
+    private List<DailyTaskDetail> getErrorDetailsByDepartmentId(Long departmentId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.eq(DailyTask::getDtDepartmentId, departmentId);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    /**
+     * 按 dt_department_id + 指定 qcId 集合查询错误明细
+     */
+    private List<DailyTaskDetail> getErrorDetailsByDepartmentIdAndQcIds(
+            Long departmentId, Set<String> qcIds, LocalDate start, LocalDate end) {
+        List<DailyTaskDetail> all = getErrorDetailsByDepartmentId(departmentId, start, end);
+        if (qcIds == null || qcIds.isEmpty()) return all;
+        return all.stream()
+                .filter(d -> qcIds.contains(d.getDtdModuleId()))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 按 dt_dept_id（班组级别）查询错误明细
+     */
+    private List<DailyTaskDetail> getErrorDetailsByDeptId(Long deptId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.eq(DailyTask::getDtDeptId, deptId);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    /**
+     * 按上级部门ID（大队）查询其下所有主管的错误明细
+     * 通过查询大队的直接下级主管，再按 dtDepartmentId 匹配
+     */
+    private List<DailyTaskDetail> getErrorDetailsBySubDepts(Long parentDeptId, LocalDate start, LocalDate end) {
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(parentDeptId);
+        if (subDepts == null || subDepts.isEmpty()) return Collections.emptyList();
+        Set<Long> managerIds = subDepts.stream()
+                .filter(d -> parentDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                .map(SysDept::getDeptId)
+                .collect(Collectors.toSet());
+        if (managerIds.isEmpty()) return Collections.emptyList();
+
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.in(DailyTask::getDtDepartmentId, managerIds);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    /**
+     * 按上级部门ID（大队）查询其下所有主管的错误明细，并按 qcId 过滤
+     */
+    private List<DailyTaskDetail> getErrorDetailsBySubDeptsAndQcIds(
+            Long parentDeptId, Set<String> qcIds, LocalDate start, LocalDate end) {
+        List<DailyTaskDetail> all = getErrorDetailsBySubDepts(parentDeptId, start, end);
+        if (qcIds == null || qcIds.isEmpty()) return all;
+        return all.stream()
+                .filter(d -> qcIds.contains(d.getDtdModuleId()))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 从任务列表中查询错误答题明细（dtdIsCorrect=false）
+     */
+    private List<DailyTaskDetail> getErrorDetailsFromTasks(List<DailyTask> tasks) {
+        if (tasks == null || tasks.isEmpty()) return Collections.emptyList();
+        Set<String> taskIds = tasks.stream().map(DailyTask::getDtId).collect(Collectors.toSet());
+
+        LambdaQueryWrapper<DailyTaskDetail> detailWrapper = new LambdaQueryWrapper<>();
+        detailWrapper.in(DailyTaskDetail::getDtdTaskId, taskIds);
+        detailWrapper.eq(DailyTaskDetail::getDtdIsCorrect, false);
+        detailWrapper.eq(DailyTaskDetail::getDelStatus, 0);
+        return dailyTaskDetailMapper.selectList(detailWrapper);
+    }
+
+    /**
+     * 构建 qcId -> level1 BaseCheckCategory 的映射（带缓存，避免重复查询）
+     */
+    private Map<String, BaseCheckCategory> buildQcIdToLevel1Map(List<DailyTaskDetail> details) {
+        Map<String, BaseCheckCategory> result = new HashMap<>();
+        Map<String, BaseCheckCategory> qcNameToLevel1Cache = new HashMap<>();
+
+        for (DailyTaskDetail detail : details) {
+            String qcId = detail.getDtdModuleId();
+            if (qcId == null || qcId.trim().isEmpty() || result.containsKey(qcId)) continue;
+
+            LambdaQueryWrapper<QuesCat> catWrapper = new LambdaQueryWrapper<>();
+            catWrapper.eq(QuesCat::getQcId, qcId);
+            catWrapper.eq(QuesCat::getDelStatus, 0);
+            QuesCat quesCat = quesCatService.getOne(catWrapper);
+
+            if (quesCat == null) {
+                result.put(qcId, null);
+                continue;
+            }
+
+            String qcName = quesCat.getQcName();
+            if (qcNameToLevel1Cache.containsKey(qcName)) {
+                result.put(qcId, qcNameToLevel1Cache.get(qcName));
+            } else {
+                BaseCheckCategory level1 = baseCheckCategoryService.selectLevel1ByLevel2Name(qcName);
+                qcNameToLevel1Cache.put(qcName, level1);
+                result.put(qcId, level1);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 构建小类名称 -> qcId 的映射
+     */
+    private Map<String, String> buildSubCatNameToQcIdMap(List<String> subCatNames) {
+        Map<String, String> result = new HashMap<>();
+        for (String name : subCatNames) {
+            LambdaQueryWrapper<QuesCat> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(QuesCat::getQcName, name);
+            wrapper.eq(QuesCat::getDelStatus, 0);
+            wrapper.last("LIMIT 1");
+            QuesCat cat = quesCatService.getOne(wrapper);
+            result.put(name, cat != null ? cat.getQcId() : null);
+        }
+        return result;
+    }
+
+    /**
+     * 构建折线趋势数据，与 xAxis 对齐
+     */
+    private List<Integer> buildTrendData(List<String> xAxis, List<DailyTaskDetail> details, SimpleDateFormat sdf) {
+        if (details == null || details.isEmpty()) {
+            return xAxis.stream().map(x -> 0).collect(Collectors.toList());
+        }
+        Set<String> taskIds = details.stream().map(DailyTaskDetail::getDtdTaskId).collect(Collectors.toSet());
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.in(DailyTask::getDtId, taskIds);
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        Map<String, String> taskIdToDate = tasks.stream()
+                .filter(t -> t.getDtBusinessDate() != null)
+                .collect(Collectors.toMap(DailyTask::getDtId, t -> sdf.format(t.getDtBusinessDate()), (a, b) -> a));
+
+        Map<String, Long> countByDate = details.stream()
+                .filter(d -> taskIdToDate.containsKey(d.getDtdTaskId()))
+                .collect(Collectors.groupingBy(d -> taskIdToDate.get(d.getDtdTaskId()), Collectors.counting()));
+
+        return xAxis.stream()
+                .map(label -> countByDate.getOrDefault(label, 0L).intValue())
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 根据 timeType 计算起止日期（供 overview/radar 使用）
+     */
+    private LocalDate[] resolveDateRange(String timeType, String startDate, String endDate) {
+        LocalDate today = LocalDate.now();
+        LocalDate start;
+        LocalDate end = today;
+        switch (timeType == null ? "month" : timeType) {
+            case "year":
+                start = today.withDayOfYear(1);
+                end = today.withMonth(12).withDayOfMonth(31);
+                break;
+            case "custom":
+                start = (startDate != null) ? LocalDate.parse(startDate) : today.withDayOfMonth(1);
+                end = (endDate != null) ? LocalDate.parse(endDate) : today;
+                break;
+            default: // month
+                start = today.withDayOfMonth(1);
+                break;
+        }
+        return new LocalDate[]{start, end};
+    }
+
+    /**
+     * 根据 SysAnalysisReportParamDto 计算起止日期（供 category-detail 使用）
+     * YEAR → 全年；QUARTER → 指定季度；MONTH → 指定月份；默认 → 当月
+     */
+    private LocalDate[] resolveDateRange(SysAnalysisReportParamDto param) {
+        LocalDate today = LocalDate.now();
+        int year = (param != null && param.getYear() != null) ? param.getYear() : today.getYear();
+        String type = (param != null && param.getDateRangeQueryType() != null) ? param.getDateRangeQueryType() : "MONTH";
+        com.sundot.airport.common.core.domain.SysAnalysisReportDateRangeDto range;
+        switch (type) {
+            case "YEAR":
+                range = DateRangeQueryUtils.getYearRange(year, null);
+                break;
+            case "QUARTER":
+                int quarter = (param.getQuarter() != null) ? param.getQuarter() : 1;
+                range = DateRangeQueryUtils.getQuarterRange(year, quarter, null);
+                break;
+            default: // MONTH
+                int month = (param != null && param.getMonth() != null) ? param.getMonth() : today.getMonthValue();
+                range = DateRangeQueryUtils.getMonthRange(year, month, null);
+                break;
+        }
+        return new LocalDate[]{
+                ((java.sql.Date) range.getStartDate()).toLocalDate(),
+                ((java.sql.Date) range.getEndDate()).toLocalDate()
+        };
+    }
+
+    /**
+     * 生成 X 轴标签列表
+     */
+    private List<String> buildXAxis(LocalDate start, LocalDate end, boolean byMonth) {
+        List<String> xAxis = new ArrayList<>();
+        if (byMonth) {
+            LocalDate cursor = start.withDayOfMonth(1);
+            LocalDate endMonth = end.withDayOfMonth(1);
+            while (!cursor.isAfter(endMonth)) {
+                xAxis.add(cursor.format(DateTimeFormatter.ofPattern("yyyy-MM")));
+                cursor = cursor.plusMonths(1);
+            }
+        } else {
+            LocalDate cursor = start;
+            while (!cursor.isAfter(end)) {
+                xAxis.add(cursor.toString());
+                cursor = cursor.plusDays(1);
+            }
+        }
+        return xAxis;
+    }
+
+    /**
+     * 获取部门名称
+     */
+    private String getDeptName(Long deptId) {
+        try {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            if (loginUser.getUser().getDept() != null) {
+                return loginUser.getUser().getDept().getDeptName();
+            }
+        } catch (Exception ignored) {
+        }
+        return "本主管";
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/DailyExamWrongAnalysisPcController.java

@@ -0,0 +1,542 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.common.service.QuesCatService;
+import com.sundot.airport.exam.domain.DailyTask;
+import com.sundot.airport.exam.domain.DailyTaskDetail;
+import com.sundot.airport.exam.domain.QuesCat;
+import com.sundot.airport.exam.mapper.DailyTaskDetailMapper;
+import com.sundot.airport.exam.mapper.DailyTaskMapper;
+import com.sundot.airport.system.domain.BaseCheckCategory;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+import com.sundot.airport.system.service.IBaseCheckCategoryService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.sql.Date;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 抽问抽答错题分析 PC管理端接口（美兰4级架构）
+ * 美兰组织架构：STATION（安检站）> BRIGADE（大队）> MANAGER（主管）> 班组
+ *
+ * 接口1: GET /wrong-analysis/pc-overview  总体问题分布（饼图），支持 scopeType/scopeId
+ * 接口2: GET /wrong-analysis/pc-radar     问题分布对比（雷达图），支持 scopeType/scopeId
+ *
+ * scopeType 说明：
+ *   STATION  - 全站（scopeId=安检站deptId，可选）
+ *   BRIGADE  - 大队（scopeId=大队deptId）
+ *   MANAGER  - 主管（scopeId=主管deptId）
+ *   USER     - 个人（scopeId=userId）
+ *   不传     - 按登录用户角色自动判断（与 app 端 /wrong-analysis 相同逻辑）
+ *
+ * pc-radar scopeType 对应 series 规则：
+ *   STATION → 各大队各一条 series
+ *   BRIGADE → 该大队下各主管各一条 series
+ *   MANAGER → 单条主管 series
+ *   USER    → 单条用户 series
+ *   不传    → 站长：各大队 series；其他角色：show=false
+ */
+@RestController
+@RequestMapping("/v1/cs/app/daily-exam/wrong-analysis")
+public class DailyExamWrongAnalysisPcController {
+
+    private static final Logger log = LoggerFactory.getLogger(DailyExamWrongAnalysisPcController.class);
+
+    @Autowired
+    private DailyTaskMapper dailyTaskMapper;
+
+    @Autowired
+    private DailyTaskDetailMapper dailyTaskDetailMapper;
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    @Autowired
+    private QuesCatService quesCatService;
+
+    @Autowired
+    private IBaseCheckCategoryService baseCheckCategoryService;
+
+    // =====================================================================
+    // 接口1：总体问题分布（饼图）PC端
+    // =====================================================================
+
+    /**
+     * 总体问题分布（按大类统计错题数）
+     *
+     * @param scopeType 统计范围：STATION/BRIGADE/MANAGER/USER，不传则按角色自动判断
+     * @param scopeId   范围ID
+     */
+    @GetMapping("/pc-overview")
+    public HttpResult<Map<String, Object>> getPcOverview(
+            @RequestParam(required = false, defaultValue = "MONTH") String dateRangeQueryType,
+            @RequestParam(required = false) Integer year,
+            @RequestParam(required = false) Integer quarter,
+            @RequestParam(required = false) Integer month,
+            @RequestParam(required = false) String scopeType,
+            @RequestParam(required = false) Long scopeId) {
+
+        try {
+            LocalDate[] range = resolveDateRange(dateRangeQueryType, year, quarter, month);
+            List<DailyTaskDetail> errorDetails = getErrorDetailsByScope(scopeType, scopeId, range[0], range[1]);
+
+            Map<String, BaseCheckCategory> qcIdToLevel1 = buildQcIdToLevel1Map(errorDetails);
+
+            Map<Long, long[]> countByCategory = new LinkedHashMap<>();
+            Map<Long, String> categoryNames = new LinkedHashMap<>();
+
+            for (DailyTaskDetail detail : errorDetails) {
+                BaseCheckCategory cat = qcIdToLevel1.get(detail.getDtdModuleId());
+                if (cat != null) {
+                    countByCategory.merge(cat.getId(),
+                            new long[]{1, cat.getOrderNum() != null ? cat.getOrderNum() : 99},
+                            (a, b) -> new long[]{a[0] + 1, a[1]});
+                    categoryNames.put(cat.getId(), cat.getName());
+                }
+            }
+
+            List<Map<String, Object>> categories = countByCategory.entrySet().stream()
+                    .sorted(Comparator.comparingLong(e -> e.getValue()[1]))
+                    .map(e -> {
+                        Map<String, Object> item = new LinkedHashMap<>();
+                        item.put("id", e.getKey());
+                        item.put("name", categoryNames.get(e.getKey()));
+                        item.put("count", e.getValue()[0]);
+                        return item;
+                    })
+                    .collect(Collectors.toList());
+
+            Map<String, Object> result = new LinkedHashMap<>();
+            result.put("categories", categories);
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取总体问题分布失败(PC)", e);
+            return HttpResult.error("获取总体问题分布失败：" + e.getMessage());
+        }
+    }
+
+    // =====================================================================
+    // 接口2：问题分布对比（雷达图）PC端
+    // =====================================================================
+
+    /**
+     * 问题分布对比雷达图
+     *
+     * @param scopeType 统计范围：STATION/BRIGADE/MANAGER/USER，不传则按角色自动判断
+     * @param scopeId   范围ID
+     */
+    @GetMapping("/pc-radar")
+    public HttpResult<Map<String, Object>> getPcRadar(
+            @RequestParam(required = false, defaultValue = "MONTH") String dateRangeQueryType,
+            @RequestParam(required = false) Integer year,
+            @RequestParam(required = false) Integer quarter,
+            @RequestParam(required = false) Integer month,
+            @RequestParam(required = false) String scopeType,
+            @RequestParam(required = false) Long scopeId) {
+
+        try {
+            LocalDate[] range = resolveDateRange(dateRangeQueryType, year, quarter, month);
+
+            // 查询所有大类作为雷达维度
+            BaseCheckCategory level1Query = new BaseCheckCategory();
+            level1Query.setLevel(1);
+            List<BaseCheckCategory> level1Categories = baseCheckCategoryService.selectBaseCheckCategoryList(level1Query);
+            level1Categories.sort(Comparator.comparingInt(c -> c.getOrderNum() != null ? c.getOrderNum() : 99));
+
+            List<String> indicators = level1Categories.stream()
+                    .map(BaseCheckCategory::getName).collect(Collectors.toList());
+            List<Long> indicatorIds = level1Categories.stream()
+                    .map(BaseCheckCategory::getId).collect(Collectors.toList());
+
+            List<Map<String, Object>> series;
+
+            if ("BRIGADE".equals(scopeType) && scopeId != null) {
+                // 大队下各主管各一条 series
+                series = buildRadarSeriesByManagersInBrigade(scopeId, range, indicatorIds);
+
+            } else if ("MANAGER".equals(scopeType) && scopeId != null) {
+                // 单条主管 series
+                series = buildRadarSeriesForSingleManager(scopeId, range, indicatorIds);
+
+            } else if ("USER".equals(scopeType) && scopeId != null) {
+                // 单条用户 series
+                series = buildRadarSeriesForSingleUser(scopeId, range, indicatorIds);
+
+            } else {
+                // STATION 或 role-based：各大队各一条 series
+                Long stationDeptId = getStationDeptId(scopeType, scopeId);
+                if (stationDeptId == null) {
+                    Map<String, Object> noShow = new HashMap<>();
+                    noShow.put("show", false);
+                    return HttpResult.success(noShow);
+                }
+                series = buildRadarSeriesByBrigadesInStation(stationDeptId, range, indicatorIds);
+            }
+
+            Map<String, Object> result = new LinkedHashMap<>();
+            result.put("show", true);
+            result.put("indicators", indicators);
+            result.put("series", series);
+            return HttpResult.success(result);
+
+        } catch (Exception e) {
+            log.error("获取问题分布对比失败(PC)", e);
+            return HttpResult.error("获取问题分布对比失败：" + e.getMessage());
+        }
+    }
+
+    // =====================================================================
+    // 私有工具方法
+    // =====================================================================
+
+    /**
+     * 根据 scopeType/scopeId 获取错误明细
+     */
+    private List<DailyTaskDetail> getErrorDetailsByScope(String scopeType, Long scopeId,
+                                                          LocalDate start, LocalDate end) {
+        if ("MANAGER".equals(scopeType) && scopeId != null) {
+            return getErrorDetailsByDepartmentId(scopeId, start, end);
+        } else if ("USER".equals(scopeType) && scopeId != null) {
+            return getErrorDetailsByUserId(scopeId, start, end);
+        } else if ("BRIGADE".equals(scopeType) && scopeId != null) {
+            return getErrorDetailsBySubDepts(scopeId, start, end);
+        } else {
+            // STATION 或 role-based
+            Long deptId = getStationDeptId(scopeType, scopeId);
+            if (deptId == null) {
+                // 非站长，按角色判断
+                RoleInfo role = getRoleInfo();
+                if (role.isBrigade) {
+                    return getErrorDetailsBySubDepts(role.userDeptId, start, end);
+                } else if (role.isKezhang) {
+                    return getErrorDetailsByDepartmentId(role.userDeptId, start, end);
+                } else {
+                    return getErrorDetailsByDeptId(role.userDeptId, start, end);
+                }
+            }
+            List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(deptId);
+            Set<Long> allDeptIds = new HashSet<>();
+            allDeptIds.add(deptId);
+            if (subDepts != null) subDepts.forEach(d -> allDeptIds.add(d.getDeptId()));
+            return getErrorDetailsByDeptIds(allDeptIds, start, end);
+        }
+    }
+
+    /**
+     * 获取站级 deptId：
+     * - scopeType=STATION → 取 scopeId（若有）或当前用户 deptId（需是站长角色）
+     * - scopeType=null → 若当前用户是站长则取其 deptId，否则返回 null
+     */
+    private Long getStationDeptId(String scopeType, Long scopeId) {
+        if ("STATION".equals(scopeType)) {
+            if (scopeId != null) return scopeId;
+            return SecurityUtils.getLoginUser().getDeptId();
+        }
+        RoleInfo role = getRoleInfo();
+        if (role.isStation) return role.userDeptId;
+        return null;
+    }
+
+    /**
+     * 雷达图：站下各大队各一条 series
+     */
+    private List<Map<String, Object>> buildRadarSeriesByBrigadesInStation(
+            Long stationDeptId, LocalDate[] range, List<Long> indicatorIds) {
+
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(stationDeptId);
+        List<SysDept> brigadeDepts = subDepts == null ? Collections.emptyList() :
+                subDepts.stream()
+                        .filter(d -> stationDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                        .collect(Collectors.toList());
+
+        List<Map<String, Object>> series = new ArrayList<>();
+        for (SysDept brigade : brigadeDepts) {
+            List<DailyTaskDetail> details = getErrorDetailsBySubDepts(brigade.getDeptId(), range[0], range[1]);
+            series.add(buildRadarSeriesItem(brigade.getDeptName(), brigade.getDeptId(), details, indicatorIds));
+        }
+        return series;
+    }
+
+    /**
+     * 雷达图：大队下各主管各一条 series
+     */
+    private List<Map<String, Object>> buildRadarSeriesByManagersInBrigade(
+            Long brigadeId, LocalDate[] range, List<Long> indicatorIds) {
+
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(brigadeId);
+        List<SysDept> managerDepts = subDepts == null ? Collections.emptyList() :
+                subDepts.stream()
+                        .filter(d -> brigadeId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                        .collect(Collectors.toList());
+
+        List<Map<String, Object>> series = new ArrayList<>();
+        for (SysDept manager : managerDepts) {
+            List<DailyTaskDetail> details = getErrorDetailsByDepartmentId(manager.getDeptId(), range[0], range[1]);
+            series.add(buildRadarSeriesItem(manager.getDeptName(), manager.getDeptId(), details, indicatorIds));
+        }
+        return series;
+    }
+
+    /**
+     * 雷达图：单条主管 series
+     */
+    private List<Map<String, Object>> buildRadarSeriesForSingleManager(
+            Long managerId, LocalDate[] range, List<Long> indicatorIds) {
+
+        List<DailyTaskDetail> details = getErrorDetailsByDepartmentId(managerId, range[0], range[1]);
+        String name = getManagerName(managerId);
+        return Collections.singletonList(buildRadarSeriesItem(name, managerId, details, indicatorIds));
+    }
+
+    /**
+     * 雷达图：单条用户 series
+     */
+    private List<Map<String, Object>> buildRadarSeriesForSingleUser(
+            Long userId, LocalDate[] range, List<Long> indicatorIds) {
+
+        List<DailyTaskDetail> details = getErrorDetailsByUserId(userId, range[0], range[1]);
+        String name = getUserName(userId, details);
+        Map<String, Object> item = buildRadarSeriesItemWithUserId(name, userId, details, indicatorIds);
+        return Collections.singletonList(item);
+    }
+
+    /**
+     * 构建雷达图单条 series（deptId）
+     */
+    private Map<String, Object> buildRadarSeriesItem(String name, Long deptId,
+                                                      List<DailyTaskDetail> details,
+                                                      List<Long> indicatorIds) {
+        Map<String, BaseCheckCategory> qcIdToLevel1 = buildQcIdToLevel1Map(details);
+        Map<Long, Long> countMap = details.stream()
+                .filter(d -> qcIdToLevel1.get(d.getDtdModuleId()) != null)
+                .collect(Collectors.groupingBy(
+                        d -> qcIdToLevel1.get(d.getDtdModuleId()).getId(),
+                        Collectors.counting()));
+
+        List<Long> data = indicatorIds.stream()
+                .map(id -> countMap.getOrDefault(id, 0L))
+                .collect(Collectors.toList());
+
+        Map<String, Object> s = new LinkedHashMap<>();
+        s.put("name", name);
+        s.put("deptId", deptId);
+        s.put("data", data);
+        return s;
+    }
+
+    /**
+     * 构建雷达图单条 series（userId）
+     */
+    private Map<String, Object> buildRadarSeriesItemWithUserId(String name, Long userId,
+                                                                List<DailyTaskDetail> details,
+                                                                List<Long> indicatorIds) {
+        Map<String, BaseCheckCategory> qcIdToLevel1 = buildQcIdToLevel1Map(details);
+        Map<Long, Long> countMap = details.stream()
+                .filter(d -> qcIdToLevel1.get(d.getDtdModuleId()) != null)
+                .collect(Collectors.groupingBy(
+                        d -> qcIdToLevel1.get(d.getDtdModuleId()).getId(),
+                        Collectors.counting()));
+
+        List<Long> data = indicatorIds.stream()
+                .map(id -> countMap.getOrDefault(id, 0L))
+                .collect(Collectors.toList());
+
+        Map<String, Object> s = new LinkedHashMap<>();
+        s.put("name", name);
+        s.put("userId", userId);
+        s.put("data", data);
+        return s;
+    }
+
+    private RoleInfo getRoleInfo() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        List<String> roleKeys = loginUser.getUser().getRoles().stream()
+                .map(SysRole::getRoleKey).collect(Collectors.toList());
+        Long userDeptId = loginUser.getDeptId();
+        Long userId = loginUser.getUserId();
+
+        boolean isStation = userId == 1L
+                || roleKeys.contains(RoleTypeEnum.admin.getCode())
+                || roleKeys.contains(RoleTypeEnum.test.getCode())
+                || roleKeys.contains(RoleTypeEnum.zhijianke.getCode());
+        boolean isBrigade = !isStation && (roleKeys.contains(RoleTypeEnum.jingli.getCode())
+                || roleKeys.contains(RoleTypeEnum.xingzheng.getCode()));
+        boolean isKezhang = !isStation && !isBrigade && roleKeys.contains(RoleTypeEnum.kezhang.getCode());
+
+        RoleInfo info = new RoleInfo();
+        info.isStation = isStation;
+        info.isBrigade = isBrigade;
+        info.isKezhang = isKezhang;
+        info.userDeptId = userDeptId;
+        return info;
+    }
+
+    private static class RoleInfo {
+        boolean isStation;
+        boolean isBrigade;
+        boolean isKezhang;
+        Long userDeptId;
+    }
+
+    private List<DailyTaskDetail> getErrorDetailsByDeptIds(Set<Long> deptIds, LocalDate start, LocalDate end) {
+        if (deptIds == null || deptIds.isEmpty()) return Collections.emptyList();
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.in(DailyTask::getDtDeptId, deptIds);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    private List<DailyTaskDetail> getErrorDetailsByDepartmentId(Long departmentId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.eq(DailyTask::getDtDepartmentId, departmentId);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    private List<DailyTaskDetail> getErrorDetailsByDeptId(Long deptId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.eq(DailyTask::getDtDeptId, deptId);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    private List<DailyTaskDetail> getErrorDetailsByUserId(Long userId, LocalDate start, LocalDate end) {
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.eq(DailyTask::getDtUserId, userId);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    /**
+     * 查询上级部门（大队）下所有直接子部门（主管）的错误明细
+     */
+    private List<DailyTaskDetail> getErrorDetailsBySubDepts(Long parentDeptId, LocalDate start, LocalDate end) {
+        List<SysDept> subDepts = sysDeptMapper.selectChildrenDeptById(parentDeptId);
+        if (subDepts == null || subDepts.isEmpty()) return Collections.emptyList();
+        Set<Long> managerIds = subDepts.stream()
+                .filter(d -> parentDeptId.equals(d.getParentId()) && "0".equals(d.getDelFlag()))
+                .map(SysDept::getDeptId)
+                .collect(Collectors.toSet());
+        if (managerIds.isEmpty()) return Collections.emptyList();
+        LambdaQueryWrapper<DailyTask> taskWrapper = new LambdaQueryWrapper<>();
+        taskWrapper.in(DailyTask::getDtDepartmentId, managerIds);
+        taskWrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(start));
+        taskWrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(end));
+        taskWrapper.eq(DailyTask::getDelStatus, 0);
+        List<DailyTask> tasks = dailyTaskMapper.selectList(taskWrapper);
+        return getErrorDetailsFromTasks(tasks);
+    }
+
+    private List<DailyTaskDetail> getErrorDetailsFromTasks(List<DailyTask> tasks) {
+        if (tasks == null || tasks.isEmpty()) return Collections.emptyList();
+        Set<String> taskIds = tasks.stream().map(DailyTask::getDtId).collect(Collectors.toSet());
+        LambdaQueryWrapper<DailyTaskDetail> detailWrapper = new LambdaQueryWrapper<>();
+        detailWrapper.in(DailyTaskDetail::getDtdTaskId, taskIds);
+        detailWrapper.eq(DailyTaskDetail::getDtdIsCorrect, false);
+        detailWrapper.eq(DailyTaskDetail::getDelStatus, 0);
+        return dailyTaskDetailMapper.selectList(detailWrapper);
+    }
+
+    private Map<String, BaseCheckCategory> buildQcIdToLevel1Map(List<DailyTaskDetail> details) {
+        Map<String, BaseCheckCategory> result = new HashMap<>();
+        Map<String, BaseCheckCategory> qcNameToLevel1Cache = new HashMap<>();
+
+        for (DailyTaskDetail detail : details) {
+            String qcId = detail.getDtdModuleId();
+            if (qcId == null || qcId.trim().isEmpty() || result.containsKey(qcId)) continue;
+
+            LambdaQueryWrapper<QuesCat> catWrapper = new LambdaQueryWrapper<>();
+            catWrapper.eq(QuesCat::getQcId, qcId);
+            catWrapper.eq(QuesCat::getDelStatus, 0);
+            QuesCat quesCat = quesCatService.getOne(catWrapper);
+
+            if (quesCat == null) {
+                result.put(qcId, null);
+                continue;
+            }
+
+            String qcName = quesCat.getQcName();
+            if (qcNameToLevel1Cache.containsKey(qcName)) {
+                result.put(qcId, qcNameToLevel1Cache.get(qcName));
+            } else {
+                BaseCheckCategory level1 = baseCheckCategoryService.selectLevel1ByLevel2Name(qcName);
+                qcNameToLevel1Cache.put(qcName, level1);
+                result.put(qcId, level1);
+            }
+        }
+        return result;
+    }
+
+    private LocalDate[] resolveDateRange(String dateRangeQueryType, Integer year, Integer quarter, Integer month) {
+        LocalDate today = LocalDate.now();
+        int y = (year != null) ? year : today.getYear();
+        String type = (dateRangeQueryType != null) ? dateRangeQueryType : "MONTH";
+        LocalDate start, end;
+        switch (type) {
+            case "YEAR":
+                start = LocalDate.of(y, 1, 1);
+                end = LocalDate.of(y, 12, 31);
+                break;
+            case "QUARTER":
+                int q = (quarter != null) ? quarter : 1;
+                start = LocalDate.of(y, (q - 1) * 3 + 1, 1);
+                end = start.plusMonths(3).minusDays(1);
+                break;
+            case "MONTH":
+            default:
+                int m = (month != null) ? month : today.getMonthValue();
+                start = LocalDate.of(y, m, 1);
+                end = start.withDayOfMonth(start.lengthOfMonth());
+                break;
+        }
+        return new LocalDate[]{start, end};
+    }
+
+    private String getManagerName(Long managerId) {
+        try {
+            SysDept dept = sysDeptMapper.selectDeptById(managerId);
+            if (dept != null) return dept.getDeptName();
+        } catch (Exception ignored) {
+        }
+        return "主管" + managerId;
+    }
+
+    private String getUserName(Long userId, List<DailyTaskDetail> details) {
+        if (details.isEmpty()) return "用户" + userId;
+        Set<String> taskIds = details.stream().map(DailyTaskDetail::getDtdTaskId).collect(Collectors.toSet());
+        LambdaQueryWrapper<DailyTask> w = new LambdaQueryWrapper<>();
+        w.in(DailyTask::getDtId, taskIds);
+        w.eq(DailyTask::getDelStatus, 0);
+        w.last("LIMIT 1");
+        DailyTask task = dailyTaskMapper.selectOne(w);
+        if (task != null && task.getDtUserName() != null) return task.getDtUserName();
+        return "用户" + userId;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/EighteenController.java

@@ -0,0 +1,109 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.sundot.airport.exam.common.ClientTypeConstant;
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.common.PageData;
+import com.sundot.airport.exam.logic.eighteen.model.params.*;
+import com.sundot.airport.exam.logic.eighteen.model.result.*;
+import com.sundot.airport.exam.logic.eighteen.model.result.subresult.ItemIn18ExamRecordListResult;
+import com.sundot.airport.exam.logic.eighteen.service.EighteenService;
+import com.sundot.airport.exam.logic.eighteen.service.ExamOnlineService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * <b>功能名：</b>EighteenController<br>
+ * <b>说明：</b> 十八大接口控制层 <br>
+ * <b>著作权：</b> Copyright (C) 2021 HUIFANEDU  CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author 2021-06-04 huifan
+ */
+@RestController
+@RequestMapping("/v1/cs/app/eighteen")
+public class EighteenController {
+
+    @Resource
+    private EighteenService eighteenService;
+    @Resource
+    private ExamOnlineService examOnlineService;
+
+
+
+    /**
+     * <b>方法名: </b> getExam <br>
+     * <b>说明: </b> 查询考试基本信息 <br>
+     *
+     * @param param Get18ExamIntroParams 查询考试基本信息参数类
+     * @return HttpResult<Get18ExamIntroResult>
+     * <b>修改履历: </b>
+     * @author 2021/7/5 Mokou
+     */
+    @PostMapping("/get_exam_intro")
+    public HttpResult<Get18ExamIntroResult> getExamIntro(@Validated @RequestBody Get18ExamIntroParams param) {
+        return eighteenService.getExamIntro(param);
+    }
+
+    /**
+     * <b>方法名: </b> applyExam <br>
+     * <b>说明: </b> 开始考试 <br>
+     *
+     * @param token java.lang.String token信息
+     * @param param com.sundot.airport.logic.eighteen.model.params.ExamRecAddParam 在线测试用户获取考试基本信息和试题请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.logic.eighteen.model.result.Check18VideoFinishResult><br>
+     * <b>修改履历: </b>
+     * @author 2021/7/5 liangxiao
+     */
+    @PostMapping("/get_exam")
+
+    public HttpResult<ExamGetResult> applyExam(@RequestHeader(value="Authorization", required=true) String token,
+                                               @Validated @RequestBody ExamRecAddParam param) {
+        // 十八大对应的院长端
+        param.setClientType(ClientTypeConstant.CLIENT_TYPE_KG_APP);
+        return examOnlineService.applyExam(token, param);
+    }
+
+    /**
+     * <b>方法名: </b> getExamRecordList <br>
+     * <b>说明: </b> 查询测试记录列表 <br>
+     *
+     * @param param Get18ExamRecordListParams 查询测试记录列表参数类
+     * @return HttpResult<PageData < ItemIn18ExamRecordListResult>>
+     * <b>修改履历: </b>
+     * @author 2021/7/5 Mokou
+     */
+    @PostMapping("/get_exam_record_list")
+    public HttpResult<PageData<ItemIn18ExamRecordListResult>> getExamRecordList(@Validated @RequestBody Get18ExamRecordListParams param) {
+        return eighteenService.getExamRecordList(param);
+    }
+
+    /**
+     * <b>方法名: </b> getExamRecord <br>
+     * <b>说明: </b> 查询测试记录详情 <br>
+     *
+     * @param param Get18ExamRecordParams 查询测试记录详情参数类
+     * @return HttpResult<ItemIn18ExamRecordResult>
+     * <b>修改履历: </b>
+     * @author 2021/7/5 Mokou
+     */
+    @PostMapping("/get_exam_record")
+    public HttpResult<ItemIn18ExamRecordResult> getExamRecord(@Validated @RequestBody Get18ExamRecordParams param) {
+        return eighteenService.getExamRecord(param);
+    }
+
+    /**
+     * <b>方法名: </b> submitExam <br>
+     * <b>说明: </b> 提交考试 <br>
+     *
+     * @param param SubmitExamParam 提交考试参数类
+     * @return HttpResult<SubmitExamResult>
+     * <b>修改履历: </b>
+     * @author 2021/7/6 Mokou
+     */
+    @PostMapping("/submit_exam")
+    public HttpResult<SubmitExamResult> submitExam(@Validated @RequestBody SubmitExamParam param) {
+        return eighteenService.submitExam(param);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/ExamController.java

@@ -0,0 +1,139 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.common.PageData;
+import com.sundot.airport.exam.logic.manage.model.params.*;
+import com.sundot.airport.exam.logic.manage.model.result.*;
+import com.sundot.airport.exam.logic.manage.service.ExamBizService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ * <b>功能名：</b>ExamController<br>
+ * <b>说明：</b> 考试管理表管理 225200 - 225299 <br>
+ * <b>著作权：</b> Copyright (C) 2021 HUIFANEDU  CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author 2021-06-23 liangxiao
+ */
+@RestController
+@RequestMapping("/v1/cs/manage/exam")
+public class ExamController extends BaseController {
+
+    @Resource
+    private ExamBizService examBizService;
+
+    /**
+     * <b>方法名: </b> page <br>
+     * <b>说明: </b> 考试管理表分页列表 <br>
+     *
+     * @param param com.sundot.airport.model.params.ExamPageParam 考试管理表分页列表请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.huifanedu.kernel.model.pager.PageData < com.sundot.airport.model.result.ExamPageResult>>
+     * <b>修改履历: </b>
+     * @author 2021-06-23 liangxiao
+     */
+    @PostMapping("/list")
+    public HttpResult<PageData<ExamPageResult>> page(@RequestBody ExamPageParam param) {
+        return examBizService.pageList(param);
+    }
+
+    /**
+     * <b>方法名: </b> get <br>
+     * <b>说明: </b> 考试管理表详情 <br>
+     *
+     * @param exId java.lang.String 考试业务id
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.model.result.ExamGetResult>
+     * <b>修改履历: </b>
+     * @author 2021-06-23 liangxiao
+     */
+    @GetMapping("")
+    public HttpResult<ExamGetResult> get(@RequestParam("exId") String exId) {
+        HttpResult<ExamGetResult> res = examBizService.get(exId);
+        if (res.getModel().getExExamTime() != null && res.getModel().getExExamTime() > 0) {
+            // 数据库中保存的时间为秒 前端需要分钟
+            res.getModel().setExExamTime(res.getModel().getExExamTime() / 60);
+        }
+        return res;
+    }
+
+    /**
+     * <b>方法名: </b> add <br>
+     * <b>说明: </b> 考试管理表添加 <br>
+     *
+     * @param param com.sundot.airport.model.params.ExamAddParam 考试管理表添加请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.model.result.ExamAddResult>
+     * <b>修改履历: </b>
+     * @author 2021-06-23 liangxiao
+     */
+    @PostMapping("")
+    public HttpResult<ExamAddResult> add(@Valid @RequestBody ExamAddParam param) {
+        if (param.getExExamTime() > 0) {
+            // 前端传入分钟 数据库中为秒
+            param.setExExamTime(param.getExExamTime() * 60);
+        }
+        return examBizService.add(param);
+    }
+
+    /**
+     * <b>方法名: </b> delete <br>
+     * <b>说明: </b> 考试管理表删除 <br>
+     *
+     * @param param com.sundot.airport.model.params.ExamDelParam 考试管理表删除请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-23 liangxiao
+     */
+    @DeleteMapping("")
+    public HttpResult<Boolean> del(@Valid @RequestBody ExamDelParam param) {
+        return examBizService.delete(param);
+    }
+
+    /**
+     * <b>方法名: </b> update <br>
+     * <b>说明: </b> 考试管理表修改 <br>
+     *
+     * @param param com.sundot.airport.model.params.ExamUpdParam 考试管理表修改请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-23 liangxiao
+     */
+    @PutMapping("")
+    public HttpResult<Boolean> update(@Valid @RequestBody ExamUpdParam param) {
+        if (param.getExExamTime() > 0) {
+            // 前端传入分钟 数据库为秒
+            param.setExExamTime(param.getExExamTime() * 60);
+        }
+        return examBizService.update(param);
+    }
+
+    /**
+     * <b>方法名: </b> recordList <br>
+     * <b>说明: </b> 考试批阅列表 <br>
+     *
+     * @param param com.sundot.airport.logic.manage.model.params.ExamRecordPageParam 考试记录查询的参数封装
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.huifanedu.kernel.model.pager.PageData < com.sundot.airport.logic.manage.model.result.ExamRecordPageResult>><br>
+     * <b>修改履历: </b>
+     * @author 2021/7/6 liangxiao
+     */
+    @PostMapping("/record_list")
+    public HttpResult<PageData<ExamRecordPageResult>> recordList(@Valid @RequestBody ExamRecordPageParam param) {
+        return examBizService.recordList(param);
+    }
+
+    /**
+     * <b>方法名: </b> recordDetail <br>
+     * <b>说明: </b> 考试记录详情 <br>
+     *
+     * @param erId java.lang.String 测试记录业务id
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.huifanedu.kernel.model.pager.PageData < com.sundot.airport.logic.manage.model.result.ExamRecordDetailResult>><br>
+     * <b>修改履历: </b>
+     * @author 2021/7/6 liangxiao
+     */
+    @GetMapping("/record_detail")
+    public HttpResult<ExamRecordDetailResult> recordDetail(@RequestParam("erId") String erId) {
+        return examBizService.recordDetail(erId);
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/QuesCatController.java

@@ -0,0 +1,104 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.common.PageData;
+import com.sundot.airport.exam.logic.manage.model.params.QuesCatAddParam;
+import com.sundot.airport.exam.logic.manage.model.params.QuesCatDelParam;
+import com.sundot.airport.exam.logic.manage.model.params.QuesCatPageParam;
+import com.sundot.airport.exam.logic.manage.model.params.QuesCatUpdParam;
+import com.sundot.airport.exam.logic.manage.model.result.QuesCatAddResult;
+import com.sundot.airport.exam.logic.manage.model.result.QuesCatGetResult;
+import com.sundot.airport.exam.logic.manage.model.result.QuesCatPageResult;
+import com.sundot.airport.exam.logic.manage.service.QuesCatBizService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ * <b>功能名：</b>QuesCatController<br>
+ * <b>说明：</b> 题目分类表管理 <br>
+ * <b>著作权：</b> Copyright (C) 2021 HUIFANEDU  CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author 2021-06-17 liangxiao
+ */
+@RestController
+@RequestMapping("/v1/cs/manage/ques_cat")
+public class QuesCatController extends BaseController {
+
+    @Resource
+    private QuesCatBizService quesCatBizService;
+
+    /**
+     * <b>方法名: </b> page <br>
+     * <b>说明: </b> 题目分类表分页列表 <br>
+     *
+     * @param param com.sundot.airport.model.params.QuesCatPageParam 题目分类表分页列表请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.huifanedu.kernel.model.pager.PageData < com.sundot.airport.model.result.QuesCatPageResult>>
+     * <b>修改履历: </b>
+     * @author 2021-06-17 liangxiao
+     */
+    @PostMapping("/list")
+    public HttpResult<PageData<QuesCatPageResult>> page(@RequestBody QuesCatPageParam param) {
+        return quesCatBizService.pageList(param);
+    }
+
+    /**
+     * <b>方法名: </b> get <br>
+     * <b>说明: </b> 题目分类表详情 <br>
+     *
+     * @param qcId java.lang.String 题目分类的业务id
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.model.result.QuesCatGetResult>
+     * <b>修改履历: </b>
+     * @author 2021-06-17 liangxiao
+     */
+    @GetMapping("")
+    public HttpResult<QuesCatGetResult> get(@Valid @RequestParam("qcId") String qcId) {
+        return quesCatBizService.get(qcId);
+    }
+
+    /**
+     * <b>方法名: </b> add <br>
+     * <b>说明: </b> 题目分类表添加 <br>
+     *
+     * @param param com.sundot.airport.model.params.QuesCatDelParam 题目分类表添加请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.logic.manage.model.result.QuesCatAddResult><br>
+     * <b>修改履历: </b>
+     * @author 2021/6/18 liangxiao
+     */
+    @PostMapping("")
+    public HttpResult<QuesCatAddResult> add(@Valid @RequestBody QuesCatAddParam param) {
+        return quesCatBizService.add(param);
+    }
+
+    /**
+     * <b>方法名: </b> delete <br>
+     * <b>说明: </b> 题目分类表删除 <br>
+     *
+     * @param param com.sundot.airport.model.params.QuesCatDelParam 题目分类表删除请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-17 liangxiao
+     */
+    @DeleteMapping("")
+    public HttpResult<Boolean> del(@Valid @RequestBody QuesCatDelParam param) {
+        return quesCatBizService.delete(param);
+    }
+
+    /**
+     * <b>方法名: </b> update <br>
+     * <b>说明: </b> 题目分类表修改 <br>
+     *
+     * @param param com.sundot.airport.model.params.QuesCatUpdParam 题目分类表修改请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-17 liangxiao
+     */
+    @PutMapping("")
+    public HttpResult<Boolean> update(@Valid @RequestBody QuesCatUpdParam param) {
+        return quesCatBizService.update(param);
+    }
+
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/QuesController.java

@@ -0,0 +1,143 @@
+package com.sundot.airport.web.controller.exam;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.sundot.airport.attendance.dto.AttendancePostRecordImportVO;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.common.PageData;
+import com.sundot.airport.exam.dto.QuestionImportDTO;
+import com.sundot.airport.exam.logic.manage.model.params.*;
+import com.sundot.airport.exam.logic.manage.model.result.QuesAddResult;
+import com.sundot.airport.exam.logic.manage.model.result.QuesGetResult;
+import com.sundot.airport.exam.logic.manage.model.result.QuesPageResult;
+import com.sundot.airport.exam.logic.manage.service.QuesBizService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <b>功能名：</b>QuesController<br>
+ * <b>说明：</b> 题目操作管理 <br>
+ * <b>著作权：</b> Copyright (C) 2021 HUIFANEDU  CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author 2021-06-18 liangxiao
+ */
+@RestController
+@RequestMapping("/v1/cs/manage/ques")
+public class QuesController extends BaseController {
+
+    @Resource
+    private QuesBizService quesBizService;
+
+    /**
+     * <b>方法名: </b> page <br>
+     * <b>说明: </b> 题目分页列表 <br>
+     *
+     * @param param com.sundot.airport.model.params.QuesPageParam 题目分页列表请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.huifanedu.kernel.model.pager.PageData < com.sundot.airport.model.result.QuesPageResult>>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @PostMapping("/list")
+    public HttpResult<PageData<QuesPageResult>> page(@RequestBody QuesPageParam param) {
+        return quesBizService.pageList(param);
+    }
+
+    /**
+     * <b>方法名: </b> get <br>
+     * <b>说明: </b> 题目详情 <br>
+     *
+     * @param quId java.lang.String 题目业务id
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.model.result.QuesGetResult>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @GetMapping("")
+    public HttpResult<QuesGetResult> get(@RequestParam("quId") String quId) {
+        return quesBizService.get(quId);
+    }
+
+    /**
+     * <b>方法名: </b> add <br>
+     * <b>说明: </b> 题目添加 <br>
+     *
+     * @param param com.sundot.airport.model.params.QuesAddParam 新增题目添加请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.model.result.QuesAddResult>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @PostMapping("")
+    public HttpResult<QuesAddResult> add(@Valid @RequestBody QuesAddParam param) {
+        return quesBizService.add(param);
+    }
+
+    /**
+     * <b>方法名: </b> delete <br>
+     * <b>说明: </b> 题目删除 <br>
+     *
+     * @param param com.sundot.airport.model.params.QuesDelParam 题目删除请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @DeleteMapping("")
+    public HttpResult<Boolean> del(@Valid @RequestBody QuesDelParam param) {
+        return quesBizService.delete(param);
+    }
+
+    /**
+     * <b>方法名: </b> update <br>
+     * <b>说明: </b> 题目修改 <br>
+     *
+     * @param param com.sundot.airport.model.params.QuesUpdParam QuesUpdParam
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @PutMapping("")
+    public HttpResult<Boolean> update(@Valid @RequestBody QuesUpdParam param) {
+        return quesBizService.update(param);
+    }
+
+    /**
+     * <b>方法名: </b> update <br>
+     * <b>说明: </b> 题目分类转移 <br>
+     *
+     * @param param com.sundot.airport.model.params.QuesUpdParam 题目修改分类请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @PutMapping("/cat")
+    public HttpResult<Boolean> batchUpdCat(@Valid @RequestBody QuesUpdCatParam param) {
+        return quesBizService.batchCatUpdate(param);
+    }
+
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<QuestionImportDTO> util = new ExcelUtil<QuestionImportDTO>(QuestionImportDTO.class);
+        util.importTemplateExcel(response, "题目操作");
+    }
+
+    @Log(title = "题目操作管理", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        ExcelUtil<QuestionImportDTO> util = new ExcelUtil<>(QuestionImportDTO.class);
+        List<QuestionImportDTO> list = util.importExcel(file.getInputStream());
+        if (CollectionUtil.isEmpty(list)) {
+            throw new ServiceException("导入用户数据不能为空");
+        }
+        quesBizService.importData(list);
+        return AjaxResult.success();
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/QuizAccuracyAnalysisController.java

@@ -0,0 +1,43 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.dto.QuizAccuracyAnalysisResultDto;
+import com.sundot.airport.exam.service.IAccuracyStatisticsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 抽问抽答正确率分析接口
+ */
+@RestController
+@RequestMapping("/exam/quiz/accuracy-analysis")
+public class QuizAccuracyAnalysisController {
+
+    @Autowired
+    private IAccuracyStatisticsService accuracyStatisticsService;
+
+    /**
+     * 获取抽问抽答正确率分析
+     * 返回全站平均正确率、各题目分类正确率，并标注最高/薄弱分类
+     *
+     * @param startDate 开始日期（yyyy-MM-dd）
+     * @param endDate   结束日期（yyyy-MM-dd）
+     * @return 正确率分析结果
+     */
+    @GetMapping
+    public AjaxResult getQuizAccuracyAnalysis(
+            @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
+            @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        QuizAccuracyAnalysisResultDto result = accuracyStatisticsService.getQuizAccuracyAnalysis(
+                sdf.format(startDate), sdf.format(endDate));
+        return AjaxResult.success(result);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/TestPaperCatController.java

@@ -0,0 +1,109 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.common.PageData;
+import com.sundot.airport.exam.logic.manage.model.params.TestPaperCatAddParam;
+import com.sundot.airport.exam.logic.manage.model.params.TestPaperCatDelParam;
+import com.sundot.airport.exam.logic.manage.model.params.TestPaperCatPageParam;
+import com.sundot.airport.exam.logic.manage.model.params.TestPaperCatUpdParam;
+import com.sundot.airport.exam.logic.manage.model.result.TestPaperCatAddResult;
+import com.sundot.airport.exam.logic.manage.model.result.TestPaperCatGetResult;
+import com.sundot.airport.exam.logic.manage.model.result.TestPaperCatPageResult;
+import com.sundot.airport.exam.logic.manage.service.TestPaperCatBizService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ * <b>功能名：</b>TestPaperCatController<br>
+ * <b>说明：</b> 试卷分类表管理 <br>
+ * <b>著作权：</b> Copyright (C) 2021 HUIFANEDU  CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author 2021-06-18 liangxiao
+ */
+@RestController
+@RequestMapping("/v1/cs/manage/test_paper_cat")
+public class TestPaperCatController extends BaseController {
+
+    @Resource
+    private TestPaperCatBizService testPaperCatBizService;
+
+    /**
+     * <b>方法名: </b> page <br>
+     * <b>说明: </b> 试卷分类表分页列表 <br>
+     *
+     * @param param com.sundot.airport.model.params.TestPaperCatPageParam 试卷分类表分页列表请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.huifanedu.kernel.model.pager.PageData < com.sundot.airport.model.result.TestPaperCatPageResult>>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @PostMapping("/list")
+//    @Log(key = 225101, value = "试卷分类表分页列表", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<PageData<TestPaperCatPageResult>> page(@RequestBody TestPaperCatPageParam param) {
+        return testPaperCatBizService.pageList(param);
+    }
+
+    /**
+     * <b>方法名: </b> get <br>
+     * <b>说明: </b> 试卷分类表详情 <br>
+     *
+     * @param tpcId java.lang.String 试卷分类的业务id
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.model.result.TestPaperCatGetResult>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @GetMapping("")
+//    @Log(key = 225102, value = "试卷分类表详情", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<TestPaperCatGetResult> get(@Valid @RequestParam("tpcId") String tpcId) {
+        return testPaperCatBizService.get(tpcId);
+    }
+
+    /**
+     * <b>方法名: </b> add <br>
+     * <b>说明: </b> 试卷分类表添加 <br>
+     *
+     * @param param com.sundot.airport.model.params.TestPaperCatAddParam 试卷分类表添加请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.model.result.TestPaperCatAddResult>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @PostMapping("")
+//    @Log(key = 225103, value = "试卷分类表添加", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<TestPaperCatAddResult> add(@Valid @RequestBody TestPaperCatAddParam param) {
+        return testPaperCatBizService.add(param);
+    }
+
+    /**
+     * <b>方法名: </b> delete <br>
+     * <b>说明: </b> 试卷分类表删除 <br>
+     *
+     * @param param com.sundot.airport.model.params.TestPaperCatDelParam 试卷分类表删除请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @DeleteMapping("")
+//    @Log(key = 225104, value = "试卷分类表删除", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<Boolean> del(@Valid @RequestBody TestPaperCatDelParam param) {
+        return testPaperCatBizService.delete(param);
+    }
+
+    /**
+     * <b>方法名: </b> update <br>
+     * <b>说明: </b> 试卷分类表修改 <br>
+     *
+     * @param param com.sundot.airport.model.params.TestPaperCatUpdParam 试卷分类表修改请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @PutMapping("")
+//    @Log(key = 225105, value = "试卷分类表修改", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<Boolean> update(@Valid @RequestBody TestPaperCatUpdParam param) {
+        return testPaperCatBizService.update(param);
+    }
+
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/TestPaperController.java

@@ -0,0 +1,135 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.sundot.airport.exam.common.HttpResult;
+import com.sundot.airport.exam.common.PageData;
+import com.sundot.airport.exam.logic.manage.model.params.*;
+import com.sundot.airport.exam.logic.manage.model.result.TestPaperAddResult;
+import com.sundot.airport.exam.logic.manage.model.result.TestPaperGetResult;
+import com.sundot.airport.exam.logic.manage.model.result.TestPaperPageResult;
+import com.sundot.airport.exam.logic.manage.service.TestPaperBizService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ * <b>功能名：</b>TestPaperController<br>
+ * <b>说明：</b> 试卷表管理 <br>
+ * <b>著作权：</b> Copyright (C) 2021 HUIFANEDU  CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author 2021-06-22 liangxiao
+ */
+@RestController
+@RequestMapping("/v1/cs/manage/test_paper")
+public class TestPaperController extends BaseController {
+
+    @Resource
+    private TestPaperBizService testPaperBizService;
+
+    /**
+     * <b>方法名: </b> page <br>
+     * <b>说明: </b> 试卷表分页列表 <br>
+     *
+     * @param param com.sundot.airport.model.params.TestPaperPageParam 试卷表分页列表请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.huifanedu.kernel.model.pager.PageData < com.sundot.airport.model.result.TestPaperPageResult>>
+     * <b>修改履历: </b>
+     * @author 2021-06-22 liangxiao
+     */
+    @PostMapping("/list")
+//    @Log(key = 225151, value = "试卷表分页列表", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<PageData<TestPaperPageResult>> page(@RequestBody TestPaperPageParam param) {
+        return testPaperBizService.pageList(param);
+    }
+
+    /**
+     * <b>方法名: </b> get <br>
+     * <b>说明: </b> 试卷表详情 <br>
+     *
+     * @param tpId java.lang.String 试卷业务id
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.model.result.TestPaperGetResult>
+     * <b>修改履历: </b>
+     * @author 2021-06-22 liangxiao
+     */
+    @GetMapping("")
+//    @Log(key = 225152, value = "试卷表详情", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<TestPaperGetResult> get(@RequestParam("tpId") String tpId) {
+        return testPaperBizService.get(tpId);
+    }
+
+    /**
+     * <b>方法名: </b> add <br>
+     * <b>说明: </b> 试卷表添加 <br>
+     *
+     * @param param com.sundot.airport.model.params.TestPaperAddParam 试卷表添加请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.model.result.TestPaperAddResult>
+     * <b>修改履历: </b>
+     * @author 2021-06-22 liangxiao
+     */
+    @PostMapping("")
+//    @Log(key = 225153, value = "试卷表添加", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<TestPaperAddResult> add(@Valid @RequestBody TestPaperAddParam param) {
+        return testPaperBizService.add(param);
+    }
+
+    /**
+     * <b>方法名: </b> delete <br>
+     * <b>说明: </b> 试卷表删除 <br>
+     *
+     * @param param com.sundot.airport.model.params.TestPaperDelParam 试卷表删除请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-22 liangxiao
+     */
+    @DeleteMapping("")
+//    @Log(key = 225154, value = "试卷表删除", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<Boolean> del(@Valid @RequestBody TestPaperDelParam param) {
+        return testPaperBizService.delete(param);
+    }
+
+    /**
+     * <b>方法名: </b> update <br>
+     * <b>说明: </b> 试卷表修改 <br>
+     *
+     * @param param com.sundot.airport.model.params.TestPaperUpdParam 试卷表修改请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-22 liangxiao
+     */
+    @PutMapping("")
+//    @Log(key = 225155, value = "试卷表修改", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<Boolean> update(@Valid @RequestBody TestPaperUpdParam param) {
+        return testPaperBizService.update(param);
+    }
+
+
+    /**
+     * <b>方法名: </b> update <br>
+     * <b>说明: </b> 试卷分类转移 <br>
+     *
+     * @param param com.sundot.airport.model.params.TestPaperUpdCatParam 试卷修改分类请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<java.lang.Boolean>
+     * <b>修改履历: </b>
+     * @author 2021-06-18 liangxiao
+     */
+    @PutMapping("/cat")
+    //@Log(key = 225156, value = "试卷分类转移", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<Boolean> batchUpdCat(@Valid @RequestBody TestPaperUpdCatParam param) {
+        return testPaperBizService.batchCatUpdate(param);
+    }
+
+    /**
+     * <b>方法名: </b> copy <br>
+     * <b>说明: </b> 试卷复制 <br>
+     *
+     * @param param com.sundot.airport.model.params.TestPaperAddParam 试卷表添加请求参数
+     * @return com.huifanedu.kernel.model.response.HttpResult<com.sundot.airport.model.result.TestPaperAddResult>
+     * <b>修改履历: </b>
+     * @author 2021-06-22 liangxiao
+     */
+    @PostMapping("/copy")
+    //@Log(key = 225157, value = "试卷复制", mobile = SystemConstant.YGHD_LIANG_XIAO)
+    public HttpResult<Boolean> copy(@Valid @RequestBody TestPaperCopyParam param) {
+        return testPaperBizService.copy(param);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/WeakModuleRuleController.java

@@ -0,0 +1,138 @@
+package com.sundot.airport.web.controller.exam;
+
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.dto.WeakModuleDetailDTO;
+import com.sundot.airport.exam.domain.WeakModuleRule;
+import com.sundot.airport.exam.dto.WeakModuleRuleDTO;
+import com.sundot.airport.exam.service.IWeakModuleRuleService;
+import com.sundot.airport.exam.service.IWeakModuleStatisticsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <b>功能名：</b>WeakModuleRuleController<br>
+ * <b>说明：</b> 薄弱项出题规则管理Controller <br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ * <b>修改履历：
+ *
+ * @author Simon Lin
+ */
+@Api(tags = "薄弱项出题规则管理")
+@RestController
+@RequestMapping("/exam/weakModuleRule")
+public class WeakModuleRuleController extends BaseController {
+
+    @Autowired
+    private IWeakModuleRuleService weakModuleRuleService;
+
+    @Autowired
+    private IWeakModuleStatisticsService weakModuleStatisticsService;
+
+    /**
+     * 查询规则列表
+     */
+    @ApiOperation("查询规则列表")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:list') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
+    @GetMapping("/list")
+    public TableDataInfo list() {
+        startPage();
+        List<WeakModuleRule> list = weakModuleRuleService.list();
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取规则详情
+     */
+    @ApiOperation("获取规则详情")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:query') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable Long id) {
+        return success(weakModuleRuleService.getById(id));
+    }
+
+    /**
+     * 新增规则
+     */
+    @ApiOperation("新增规则")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:add') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody WeakModuleRuleDTO dto) {
+        return toAjax(weakModuleRuleService.insert(dto));
+    }
+
+    /**
+     * 修改规则
+     */
+    @ApiOperation("修改规则")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:edit') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody WeakModuleRuleDTO dto) {
+        return toAjax(weakModuleRuleService.update(dto));
+    }
+
+    /**
+     * 删除规则
+     */
+    @ApiOperation("删除规则")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:remove') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id) {
+        return toAjax(weakModuleRuleService.deleteById(id));
+    }
+
+    /**
+     * 启用规则
+     */
+    @ApiOperation("启用规则（同时只能有一个启用）")
+    @PreAuthorize("@ss.hasPermi('exam:weakModuleRule:edit') or @ss.hasRole('test') or @ss.hasRole('zhijianke')")
+    @PutMapping("/enable/{id}")
+    public AjaxResult enable(@PathVariable Long id) {
+        return toAjax(weakModuleRuleService.enable(id));
+    }
+
+    /**
+     * 获取当前启用的规则
+     */
+    @ApiOperation("获取当前启用的规则")
+    @GetMapping("/active")
+    public AjaxResult getActive() {
+        WeakModuleRule activeRule = weakModuleRuleService.getActiveRule();
+        if (activeRule == null) {
+            return warn("当前没有启用的规则");
+        }
+        return success(activeRule);
+    }
+
+    /**
+     * 获取用户的TOP3薄弱模块详细信息（用于验证算法）
+     */
+    @ApiOperation("获取用户的TOP3薄弱模块详细信息")
+    @GetMapping("/weakModules/{userId}")
+    public AjaxResult getWeakModulesDetail(
+            @ApiParam(value = "用户ID", required = true) @PathVariable Long userId) {
+        List<WeakModuleDetailDTO> details = weakModuleStatisticsService.getTop3WeakModulesDetail(userId);
+        return success(details);
+    }
+
+    /**
+     * 获取用户的TOP3薄弱模块详细信息及出题计划（用于验证出题算法）
+     */
+    @ApiOperation("获取用户的TOP3薄弱模块详细信息及出题计划")
+    @GetMapping("/weakModules/{userId}/allocation")
+    public AjaxResult getWeakModulesDetailWithAllocation(
+            @ApiParam(value = "用户ID", required = true) @PathVariable Long userId,
+            @ApiParam(value = "题目数量", required = true) @RequestParam Integer questionCount) {
+        List<WeakModuleDetailDTO> details = weakModuleStatisticsService
+                .getTop3WeakModulesDetailWithAllocation(userId, questionCount);
+        return success(details);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/home/AttendanceIndexStatsController.java

@@ -0,0 +1,554 @@
+package com.sundot.airport.web.controller.home;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.attendance.domain.AttendanceCheckRecord;
+import com.sundot.airport.attendance.domain.AttendancePostRecord;
+import com.sundot.airport.attendance.domain.AttendanceTeamUserRecord;
+import com.sundot.airport.attendance.enums.CheckInTypeEnum;
+import com.sundot.airport.attendance.service.IAttendanceCheckRecordService;
+import com.sundot.airport.attendance.service.IAttendancePostRecordService;
+import com.sundot.airport.attendance.service.IAttendanceTeamUserRecordService;
+import com.sundot.airport.check.service.ICheckLargeScreenService;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.dto.AttendanceStatsResult;
+import com.sundot.airport.common.dto.BrigadeLeaderStats;
+import com.sundot.airport.common.dto.ChannelOpenStats;
+import com.sundot.airport.common.dto.SectionLeaderStats;
+import com.sundot.airport.common.dto.SecurityCheckStats;
+import com.sundot.airport.common.dto.StationLeaderStats;
+import com.sundot.airport.common.dto.TeamLeaderStats;
+import com.sundot.airport.common.enums.DeptType;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.enums.SourceTypeEnum;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.item.domain.ItemLargeScreenTotalSomeDto;
+import com.sundot.airport.item.domain.SimpleDutySchedule;
+import com.sundot.airport.item.mapper.SimpleDutyScheduleMapper;
+import com.sundot.airport.item.service.ItemLargeScreenService;
+import com.sundot.airport.system.domain.vo.PositionInfoVO;
+import com.sundot.airport.system.service.IBasePositionService;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 考勤统计控制器
+ * 实现不同角色的考勤统计数据查询
+ *
+ * @author wangxx
+ */
+@RestController
+@RequestMapping("/attendance/stats")
+public class AttendanceIndexStatsController extends BaseController {
+
+    @Autowired
+    private IAttendancePostRecordService attendancePostRecordService;
+
+    @Autowired
+    private IAttendanceTeamUserRecordService attendanceTeamUserRecordService;
+
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private ItemLargeScreenService itemLargeScreenService;
+
+    @Autowired
+    private IAttendanceCheckRecordService attendanceCheckRecordService;
+
+    @Autowired
+    private IBasePositionService basePositionService;
+
+    @Autowired
+    private ICheckLargeScreenService checkLargeScreenService;
+
+    @Autowired
+    private SimpleDutyScheduleMapper simpleDutyScheduleMapper;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * 获取考勤统计数据
+     * 根据当前登录用户的角色返回不同的考勤统计数据
+     */
+    @GetMapping("/getAttendanceStats")
+    public AjaxResult getAttendanceStats(@RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        LoginUser loginUser = getLoginUser();
+        SysUser currentUser = loginUser.getUser();
+        Long userId = currentUser.getUserId();
+        Long deptId = currentUser.getDeptId();
+
+        // 获取用户角色列表
+        List<String> roleKeys = currentUser.getRoles().stream()
+                .map(role -> role.getRoleKey())
+                .collect(ArrayList::new, ArrayList::add, ArrayList::addAll);
+
+        AttendanceStatsResult result = new AttendanceStatsResult();
+
+        // 根据角色返回不同的统计数据
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            if (roleKeys.contains(RoleTypeEnum.SecurityCheck.getCode())) {
+                // 安检员角色：查出勤班组、出勤通道、出勤时间
+                result.setSecurityCheckStats(getSecurityCheckStats(userId, deptId));
+            } else if (roleKeys.contains(RoleTypeEnum.banzuzhang.getCode())) {
+                // 班组长角色：查出勤班组、出勤通道、出勤时间
+                result.setTeamLeaderStats(getTeamLeaderStats(userId, deptId));
+            } else if (roleKeys.contains(RoleTypeEnum.kezhang.getCode())) {
+                // 科长角色：查在岗班组、在岗人员、出勤时间、今日查获上报
+                result.setSectionLeaderStats(getSectionLeaderStats(userId, deptId));
+            } else if (roleKeys.contains(RoleTypeEnum.jingli.getCode()) || roleKeys.contains(RoleTypeEnum.xingzheng.getCode())) {
+                // 经理和大队行政角色：查在岗班组、在岗人员、通道开放、今日查获上报
+                result.setBrigadeLeaderStats(getBrigadeLeaderStats(userId, deptId));
+            } else if (roleKeys.contains(RoleTypeEnum.test.getCode()) || roleKeys.contains(RoleTypeEnum.zhijianke.getCode()) || roleKeys.contains(RoleTypeEnum.admin.getCode())) {
+                // 站长和质检科角色：查在岗班组、在岗人员、通道开放、今日查获上报
+                result.setStationLeaderStats(getStationLeaderStats(userId, deptId));
+            } else {
+                throw new ServiceException("当前用户角色无法获取考勤统计数据");
+            }
+        } else {
+            List<SysDept> sysDeptList = sysDeptService.selectAllDept(SecurityUtils.getLoginUser().getDeptId());
+            Collections.reverse(sysDeptList);
+            SysDept stationDept = sysDeptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(null);
+            if (ObjectUtil.isNull(stationDept)) {
+                throw new ServiceException("未查询到站级部门信息");
+            }
+            // 站长和质检科角色：查在岗班组、在岗人员、通道开放、今日查获上报
+            result.setStationLeaderStats(getStationLeaderStats(userId, stationDept.getDeptId()));
+        }
+
+        return AjaxResult.success(result);
+    }
+
+    /**
+     * 安检员考勤统计数据
+     * 出勤班组：查询哪个班组长在勤务板块将该安检员维护到自己班组，则显示班组长所在组织架构的班组名称
+     * 出勤通道：进入该界面的时候班组长将该安检员带上哪个通道（仅显示最后一个层级，例如A02通道）
+     * 出勤时间：安检员打卡时间，若未打卡需要提示未打卡
+     */
+    private SecurityCheckStats getSecurityCheckStats(Long userId, Long deptId) {
+        SecurityCheckStats stats = new SecurityCheckStats();
+
+        // 获取当前日期
+        Date today = DateUtil.beginOfDay(new Date());
+
+        // 获取该安检员今日的班组维护记录
+        AttendanceTeamUserRecord teamUserRecord = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordByUserId(userId, null, "1");
+
+        if (teamUserRecord != null) {
+            stats.setAttendanceTeamName(teamUserRecord.getAttendanceTeamName());
+        } else {
+            stats.setAttendanceTeamName("未分配班组");
+        }
+
+        // 获取安检员的打卡记录（上岗时间）
+        List<AttendancePostRecord> checkInRecords = attendancePostRecordService.selectTodayRecordsByUserId(null, userId, null, "1");
+        if (CollUtil.isNotEmpty(checkInRecords)) {
+            // 获取最后一条上岗记录
+            AttendancePostRecord lastRecord = checkInRecords.get(checkInRecords.size() - 1);
+            // 获取通道信息（从通道名称中提取最后一个层级）
+            if (StrUtil.isNotBlank(lastRecord.getChannelName())) {
+                String channelName = extractChannelName(lastRecord.getChannelName());
+                stats.setAttendanceChannel(channelName);
+            } else {
+                stats.setAttendanceChannel("未分配通道");
+            }
+        } else {
+            stats.setAttendanceChannel("未分配通道");
+        }
+
+        // 获取安检员的打卡记录
+        AttendanceCheckRecord attendanceCheckRecord = new AttendanceCheckRecord();
+        attendanceCheckRecord.setUserId(userId);
+        List<AttendanceCheckRecord> attendanceCheckRecords = attendanceCheckRecordService.selectAttendanceCheckRecordList(attendanceCheckRecord);
+        if (CollUtil.isNotEmpty(attendanceCheckRecords)) {
+            AttendanceCheckRecord lastRecord = attendanceCheckRecords.get(attendanceCheckRecords.size() - 1);
+            if (StrUtil.equals(CheckInTypeEnum.CLOCK_IN.getValue(), lastRecord.getCheckInType())) {
+                stats.setAttendanceTime(lastRecord.getCheckInTime());
+                stats.setAttendanceTimeTips("已打卡");
+            } else {
+                stats.setAttendanceTime(null);
+                stats.setAttendanceTimeTips("未打卡");
+            }
+        } else {
+            stats.setAttendanceTime(null);
+            stats.setAttendanceTimeTips("未打卡");
+        }
+        return stats;
+    }
+
+    /**
+     * 班组长考勤统计数据
+     * 出勤班组：查询该班组长在勤务板块将该安检员维护到自己班组，则显示自己所在组织架构的班组名称
+     * 出勤通道：进入该界面的时候班组长将该安检员带上哪个通道（仅显示最后一个层级，例如A02通道）
+     * 出勤时间：班组长打卡时间，若未打卡需要提示未打卡
+     */
+    private TeamLeaderStats getTeamLeaderStats(Long userId, Long deptId) {
+        TeamLeaderStats stats = new TeamLeaderStats();
+        Date today = DateUtil.beginOfDay(new Date());
+
+        // 获取班组长所在班组信息
+        AttendanceTeamUserRecord teamUserRecord = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordByUserId(userId, null, "1");
+
+        if (teamUserRecord != null) {
+            stats.setAttendanceTeamName(teamUserRecord.getAttendanceTeamName());
+        } else {
+            stats.setAttendanceTeamName("未分配班组");
+        }
+        // 获取通道信息（从通道名称中提取最后一个层级）
+        List<AttendancePostRecord> checkInRecords = attendancePostRecordService.selectTodayRecordsByUserId(null, userId, null, "1");
+        if (CollUtil.isNotEmpty(checkInRecords)) {
+            // 获取最后一条上岗记录
+            AttendancePostRecord lastRecord = checkInRecords.get(checkInRecords.size() - 1);
+            if (StrUtil.isNotBlank(lastRecord.getChannelName())) {
+                String channelName = extractChannelName(lastRecord.getChannelName());
+                stats.setAttendanceChannel(channelName);
+            } else {
+                stats.setAttendanceChannel("未分配通道");
+            }
+        } else {
+            stats.setAttendanceChannel("未分配通道");
+        }
+
+        // 获取班组长的打卡记录
+        AttendanceCheckRecord attendanceCheckRecord = new AttendanceCheckRecord();
+        attendanceCheckRecord.setUserId(userId);
+        List<AttendanceCheckRecord> attendanceCheckRecords = attendanceCheckRecordService.selectAttendanceCheckRecordList(attendanceCheckRecord);
+        if (CollUtil.isNotEmpty(attendanceCheckRecords)) {
+            AttendanceCheckRecord lastRecord = attendanceCheckRecords.get(attendanceCheckRecords.size() - 1);
+            if (StrUtil.equals(CheckInTypeEnum.CLOCK_IN.getValue(), lastRecord.getCheckInType())) {
+                stats.setAttendanceTime(lastRecord.getCheckInTime());
+                stats.setAttendanceTimeTips("已打卡");
+            } else {
+                stats.setAttendanceTime(null);
+                stats.setAttendanceTimeTips("未打卡");
+            }
+        } else {
+            stats.setAttendanceTime(null);
+            stats.setAttendanceTimeTips("未打卡");
+        }
+
+        return stats;
+    }
+
+    /**
+     * 科长考勤统计数据
+     * 在岗班组：进入界面时有多少班组长打了上岗卡/多少班组长维护人员区域
+     * 在岗人员：进入该界面的时候多少人被带上通道/多少人的信息被班组长进行了维护
+     * 出勤时间：科长打卡时间，若未打卡需要提示未打卡
+     * 今日查获上报：今日安检员和班组长进行上报的数量，不需要完成审核
+     */
+    private SectionLeaderStats getSectionLeaderStats(Long userId, Long deptId) {
+        SectionLeaderStats stats = new SectionLeaderStats();
+
+        // 获取当天开始和结束时间
+        Date[] dayRange = getDayStartAndEnd();
+        Date startOfDay = dayRange[0];
+        Date endOfDay = dayRange[1];
+
+        AttendanceCheckRecord attendanceCheckRecord = new AttendanceCheckRecord();
+        attendanceCheckRecord.setUserId(userId);
+        List<AttendanceCheckRecord> attendanceCheckRecords = attendanceCheckRecordService.selectAttendanceCheckRecordList(attendanceCheckRecord);
+        if (CollUtil.isNotEmpty(attendanceCheckRecords)) {
+            AttendanceCheckRecord lastRecord = attendanceCheckRecords.get(attendanceCheckRecords.size() - 1);
+            if (StrUtil.equals(CheckInTypeEnum.CLOCK_IN.getValue(), lastRecord.getCheckInType())) {
+                stats.setAttendanceTime(lastRecord.getCheckInTime());
+                stats.setAttendanceTimeTips("已打卡");
+            } else {
+                stats.setAttendanceTime(null);
+                stats.setAttendanceTimeTips("未打卡");
+            }
+        } else {
+            stats.setAttendanceTime(null);
+            stats.setAttendanceTimeTips("未打卡");
+        }
+        // 获取在岗班组数量（打了上岗卡的班组长数量/维护了人员区域的班组长数量）
+        String onDutyTeamCount = getOnDutyTeamCount(deptId, startOfDay, endOfDay);
+        stats.setOnDutyTeamCount(onDutyTeamCount);
+
+        // 获取在岗人员数量（被带上通道的人员数量或被班组长维护的人员数量）
+        String onDutyPersonnelCount = getOnDutyPersonnelCount(deptId, startOfDay, endOfDay);
+        stats.setOnDutyPersonnelCount(onDutyPersonnelCount);
+
+        // 获取今日查获上报数量（安检员和班组长上报的数量，不需要完成审核）
+        BigDecimal todaySeizureReportCount = getTodaySeizureReportCount(deptId, startOfDay, endOfDay, "3");
+        stats.setTodaySeizureReportCount(todaySeizureReportCount);
+
+        // 获取今日巡检问题数
+        Integer todayCheckCorrectionCount = getTodayCheckCorrectionCount();
+        stats.setTodayCheckCorrectionCount(todayCheckCorrectionCount);
+
+        return stats;
+    }
+
+    /**
+     * 站长/质检科考勤统计数据
+     * 在岗班组：进入界面时有多少班组长打了上岗卡/多少班组长维护人员区域
+     * 在岗人员：进入该界面的时候多少人被带上通道/多少人的信息被班组长进行了维护
+     * 通道开放：开放通道/总通道
+     * 今日查获上报：今日安检员和班组长进行上报的数量，不需要完成审核
+     */
+    private StationLeaderStats getStationLeaderStats(Long userId, Long deptId) {
+        StationLeaderStats stats = new StationLeaderStats();
+
+        // 获取当天开始和结束时间
+        Date[] dayRange = getDayStartAndEnd();
+        Date startOfDay = dayRange[0];
+        Date endOfDay = dayRange[1];
+
+        // 获取在岗班组数量（打了上岗卡的班组长数量/维护了人员区域的班组长数量）
+        String onDutyTeamCount = getOnDutyTeamCount(deptId, startOfDay, endOfDay);
+        stats.setOnDutyTeamCount(onDutyTeamCount);
+
+        // 获取在岗人员数量（被带上通道的人员数量/被班组长维护的人员数量）
+        String onDutyPersonnelCount = getOnDutyPersonnelCount(deptId, startOfDay, endOfDay);
+        stats.setOnDutyPersonnelCount(onDutyPersonnelCount);
+
+        // 获取通道开放情况：开放通道/总通道
+        ChannelOpenStats channelStats = getChannelOpenStats(startOfDay, endOfDay);
+        stats.setChannelOpenStats(channelStats);
+
+        // 获取今日查获上报数量（安检员和班组长上报的数量，不需要完成审核）
+        BigDecimal todaySeizureReportCount = getTodaySeizureReportCount(deptId, startOfDay, endOfDay, "1");
+        stats.setTodaySeizureReportCount(todaySeizureReportCount);
+
+        // 获取今日巡检问题数
+        Integer todayCheckCorrectionCount = getTodayCheckCorrectionCount();
+        stats.setTodayCheckCorrectionCount(todayCheckCorrectionCount);
+
+        SimpleDutySchedule simpleDutySchedule = simpleDutyScheduleMapper.selectSimpleDutyScheduleByDate(new Date());
+        if (Objects.nonNull(simpleDutySchedule)) {
+            stats.setDutyDeptName(simpleDutySchedule.getDepartmentName());
+        }
+
+        return stats;
+    }
+
+    /**
+     * 获取当天开始和结束时间
+     */
+    private Date[] getDayStartAndEnd() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        Date startOfDay = calendar.getTime();
+
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        calendar.set(Calendar.MILLISECOND, 999);
+        Date endOfDay = calendar.getTime();
+
+        return new Date[]{startOfDay, endOfDay};
+    }
+
+    /**
+     * 上岗卡的班组长数量/维护了人员区域的班组长数量
+     */
+    private String getOnDutyTeamCount(Long deptId, Date startOfDay, Date endOfDay) {
+        // 查询该部门下的班组长上岗记录（在指定时间范围内的记录）
+        // 先获取该部门下的所有班组长
+        List<SysUser> teamLeaderUsers = sysUserService.selectUserListByRoleKeyAndDeptId(Collections.singletonList(RoleTypeEnum.banzuzhang.getCode()), deptId);
+
+        if (CollUtil.isEmpty(teamLeaderUsers)) {
+            return "0/0";
+        }
+
+        int onDutyCount = 0;
+        // 统计在指定时间段内有上岗记录的班组长数量
+        for (SysUser teamLeader : teamLeaderUsers) {
+            List<AttendancePostRecord> attendancePostRecords = attendancePostRecordService.selectTeamOnList(new Date(), teamLeader.getDeptId());
+            if (CollUtil.isNotEmpty(attendancePostRecords)) {
+                onDutyCount++;
+            }
+        }
+
+        List<Long> teamList = teamLeaderUsers.stream().map(SysUser::getDeptId).distinct().collect(Collectors.toList());
+        // 统计该部门下维护了人员的班组数量
+        AttendanceTeamUserRecord queryRecord = new AttendanceTeamUserRecord();
+        queryRecord.setCheckInType("1");
+        List<AttendanceTeamUserRecord> teamUserRecords = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryRecord, false);
+        List<Long> distinctTeamIds = teamUserRecords.stream().filter(team -> teamList.contains(team.getAttendanceTeamId())).map(AttendanceTeamUserRecord::getAttendanceTeamId).distinct().collect(Collectors.toList());
+
+
+        //打了上岗卡的班组长数量/维护了人员区域的班组长数量
+        return onDutyCount + "/" + distinctTeamIds.size();
+    }
+
+    /**
+     * 获取在岗人员数量(在岗人/被维护的人)
+     */
+    private String getOnDutyPersonnelCount(Long deptId, Date startOfDay, Date endOfDay) {
+        // 查询该部门下的人员上岗记录（在指定时间范围内的记录）
+        // 获取该部门下的所有安检员和班组长
+        List<SysUser> personnelUsers = sysUserService.selectUserListByRoleKeyAndDeptId(
+                Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()),
+                deptId
+        );
+
+        if (CollUtil.isEmpty(personnelUsers)) {
+            return "0/0";
+        }
+
+        List<Long> personnelList = personnelUsers.stream().filter(item -> Objects.nonNull(item.getUserId())).map(item -> item.getUserId()).collect(Collectors.toList());
+
+
+        int onDutyCount = 0;
+        // 统计在指定时间段内有上岗记录的人员数量
+        for (Long personnel : personnelList) {
+            List<AttendancePostRecord> records = attendancePostRecordService.selectTodayRecordsByUserId(null, personnel, null, "1");
+            if (CollUtil.isNotEmpty(records)) {
+                onDutyCount++;
+            }
+        }
+
+        // 统计该部门下被维护到班组的人员数量
+        AttendanceTeamUserRecord queryRecord = new AttendanceTeamUserRecord();
+        queryRecord.setCheckInType("1");
+        List<AttendanceTeamUserRecord> teamUserRecords = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryRecord, false);
+        List<Long> teamUserIds = teamUserRecords.stream().filter(team -> personnelList.contains(team.getUserId())).map(team -> team.getUserId()).collect(Collectors.toList());
+
+        // 返回两个统计中较大的值（被带上通道的人员数量或被班组长维护的人员数量）
+        return onDutyCount + "/" + teamUserIds.size();
+    }
+
+    /**
+     * 获取今日查获上报数量
+     */
+    private BigDecimal getTodaySeizureReportCount(Long deptId, Date startOfDay, Date endOfDay, String type) {
+        // 查询今日的查获上报记录数量（安检员和班组长上报的数量，不需要完成审核）
+        BaseLargeScreenQueryParamDto record = new BaseLargeScreenQueryParamDto();
+        switch (type) {
+            case "1":
+                record.setInspectStationId(deptId);
+                break;
+            case "2":
+                record.setInspectBrigadeId(deptId);
+                break;
+            case "3":
+                record.setInspectDepartmentId(deptId);
+                break;
+            default:
+                break;
+        }
+        record.setStartDate(startOfDay);
+        record.setEndDate(endOfDay);
+        // 不限制process_status，即包含所有状态的记录（不需要完成审核）
+        ItemLargeScreenTotalSomeDto result = itemLargeScreenService.getPcTotalSome(record);
+        return ObjectUtil.isNotEmpty(result) ? result.getTotal() : BigDecimal.ZERO;
+    }
+
+    /**
+     * 获取通道开放统计
+     */
+    private ChannelOpenStats getChannelOpenStats(Date startOfDay, Date endOfDay) {
+        ChannelOpenStats stats = new ChannelOpenStats();
+
+        // 查询所有通道
+        List<PositionInfoVO> positionInfoVOS = basePositionService.selectChannelsUnderArea(new ArrayList<>());
+        // 获取所有通道的开放状态
+        AttendancePostRecord queryPostRecord = new AttendancePostRecord();
+        queryPostRecord.setCheckOutTimeType(1);
+        List<AttendancePostRecord> postRecords = attendancePostRecordService.selectAttendancePostRecordList(queryPostRecord);
+        List<String> collect = postRecords.stream().filter(item -> StringUtils.isNotEmpty(item.getChannelName())).map(item -> extractChannelName(item.getChannelName())).distinct().collect(Collectors.toList());
+
+        stats.setOpenChannels(collect.size());
+        stats.setTotalChannels(positionInfoVOS.size());
+        return stats;
+    }
+
+    /**
+     * 从通道名称中提取最后一个层级（例如从"安检A区/A02通道"中提取"A02通道"）
+     */
+    private String extractChannelName(String fullChannelName) {
+        if (StrUtil.isBlank(fullChannelName)) {
+            return "";
+        }
+
+        // 按斜杠分割，取最后一部分
+        String[] parts = fullChannelName.split("/");
+        if (parts.length > 0) {
+            return parts[parts.length - 1].trim();
+        }
+
+        return fullChannelName.trim();
+    }
+
+    /**
+     * 获取今日巡检问题数
+     */
+    private Integer getTodayCheckCorrectionCount() {
+        BaseLargeScreenQueryParamDto queryParam = new BaseLargeScreenQueryParamDto();
+        return checkLargeScreenService.checkCorrectionCount(queryParam);
+    }
+
+    /**
+     * 经理和大队行政考勤统计数据
+     * 在岗班组：进入界面时有多少班组长打了上岗卡/多少班组长维护人员区域
+     * 在岗人员：进入该界面的时候多少人被带上通道/多少人的信息被班组长进行了维护
+     * 通道开放：开放通道/总通道
+     * 今日查获上报：今日安检员和班组长进行上报的数量，不需要完成审核
+     */
+    private BrigadeLeaderStats getBrigadeLeaderStats(Long userId, Long deptId) {
+        BrigadeLeaderStats stats = new BrigadeLeaderStats();
+
+        // 获取当天开始和结束时间
+        Date[] dayRange = getDayStartAndEnd();
+        Date startOfDay = dayRange[0];
+        Date endOfDay = dayRange[1];
+
+        // 获取在岗班组数量（打了上岗卡的班组长数量/维护了人员区域的班组长数量）
+        String onDutyTeamCount = getOnDutyTeamCount(deptId, startOfDay, endOfDay);
+        stats.setOnDutyTeamCount(onDutyTeamCount);
+
+        // 获取在岗人员数量（被带上通道的人员数量/被班组长维护的人员数量）
+        String onDutyPersonnelCount = getOnDutyPersonnelCount(deptId, startOfDay, endOfDay);
+        stats.setOnDutyPersonnelCount(onDutyPersonnelCount);
+
+        // 获取通道开放情况：开放通道/总通道
+        ChannelOpenStats channelStats = getChannelOpenStats(startOfDay, endOfDay);
+        stats.setChannelOpenStats(channelStats);
+
+        // 获取今日查获上报数量（安检员和班组长上报的数量，不需要完成审核）
+        BigDecimal todaySeizureReportCount = getTodaySeizureReportCount(deptId, startOfDay, endOfDay, "2");
+        stats.setTodaySeizureReportCount(todaySeizureReportCount);
+
+        // 获取今日巡检问题数
+        Integer todayCheckCorrectionCount = getTodayCheckCorrectionCount();
+        stats.setTodayCheckCorrectionCount(todayCheckCorrectionCount);
+
+        SimpleDutySchedule simpleDutySchedule = simpleDutyScheduleMapper.selectSimpleDutyScheduleByDate(new Date());
+        if (Objects.nonNull(simpleDutySchedule)) {
+            stats.setDutyDeptName(simpleDutySchedule.getDepartmentName());
+        }
+
+        return stats;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/home/SeizureRankingController.java

@@ -0,0 +1,41 @@
+package com.sundot.airport.web.controller.home;
+
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.item.domain.dto.RankingQueryParamDto;
+import com.sundot.airport.item.domain.dto.SeizureRankingDto;
+import com.sundot.airport.item.service.SeizureRankingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 查获排名控制器
+ */
+@Api(tags = "查获排名")
+@Controller
+@RequestMapping("/item/seizure/ranking")
+public class SeizureRankingController extends BaseController {
+
+    @Autowired
+    private SeizureRankingService seizureRankingService;
+
+    /**
+     * 根据角色获取查获排名
+     */
+    @ApiOperation("根据角色获取查获排名")
+    @PostMapping("/getRankingByRole")
+    @ResponseBody
+    public AjaxResult getRankingByRole(@RequestBody RankingQueryParamDto param) {
+        List<SeizureRankingDto> result = seizureRankingService.getRankingByRole(param);
+        return AjaxResult.success(result);
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/home/SeizureReportController.java

@@ -0,0 +1,63 @@
+package com.sundot.airport.web.controller.home;
+
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.item.domain.home.RoleBasedSeizureReportDTO;
+import com.sundot.airport.item.service.SeizureReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * 查获上报 控制器
+ */
+@RestController
+@RequestMapping("/system/check/seizureReport")
+public class SeizureReportController {
+
+    @Autowired
+    private SeizureReportService seizureReportService;
+
+    /**
+     * 获取查获上报数据
+     *
+     * @param startDate  开始时间
+     * @param endDate    结束时间
+     * @param timeRange  时间范围, 可选值: week: 周, month: 月, quarter: 季度, half_year: 半年, year: 年
+     * @param dataSource individual=个人数据，team=班组数据（默认）
+     */
+    @GetMapping("/data")
+    public AjaxResult getSeizureReportData(
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
+            @RequestParam(required = false, defaultValue = "year") String timeRange,
+            @RequestParam(required = false, defaultValue = "team") String dataSource,
+            @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source
+    ) {
+        try {
+            // 获取当前登录用户信息
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            if (loginUser == null) {
+                return AjaxResult.error("用户未登录");
+            }
+
+            Long userId = loginUser.getUserId();
+            Long deptId = loginUser.getUser().getDeptId();
+
+            // 调用服务获取按角色分类的数据
+            RoleBasedSeizureReportDTO roleBasedDto = seizureReportService.getRoleBasedSeizureReportData(userId, deptId, startDate, endDate, timeRange, dataSource, source);
+
+            return AjaxResult.success(roleBasedDto);
+        } catch (Exception e) {
+            return AjaxResult.error("获取查获上报数据失败: " + e.getMessage());
+        }
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/item/FailedMatchItemController.java

@@ -0,0 +1,227 @@
+package com.sundot.airport.web.controller.item;
+
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
+import com.github.pagehelper.PageInfo;
+import com.sundot.airport.system.domain.SysPost;
+import com.sundot.airport.system.domain.BasePosition;
+import com.sundot.airport.system.service.ISysPostService;
+import com.sundot.airport.system.service.IBasePositionService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.item.domain.FailedMatchItem;
+import com.sundot.airport.item.service.IFailedMatchItemService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 匹配失败物品Controller
+ *
+ * @author airport
+ * @date 2025-11-21
+ */
+@RestController
+@RequestMapping("/item/failedMatch")
+public class FailedMatchItemController extends BaseController {
+    @Autowired
+    private IFailedMatchItemService failedMatchItemService;
+
+    @Autowired
+    private ISysPostService sysPostService;
+
+    @Autowired
+    private IBasePositionService basePositionService;
+
+    /**
+     * 查询当前用户的匹配失败物品列表（分页）
+     * 只查询未编辑的记录（app_edited=0或null）
+     */
+    @GetMapping("/myList")
+    public TableDataInfo getMyList(FailedMatchItem failedMatchItem) {
+        // 获取当前登录用户ID
+        Long currentUserId = getUserId();
+
+        // 设置查询条件为当前用户ID
+        failedMatchItem.setUserId(currentUserId);
+
+        // 只查询未编辑的记录（app_edited=0或null）
+        failedMatchItem.setAppEdited(false);
+
+        // 开启分页
+        startPage();
+
+        // 查询列表（按 update_time 降序排列）
+        List<FailedMatchItem> list = failedMatchItemService.selectFailedMatchItemList(failedMatchItem);
+
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询匹配失败物品列表（管理员）
+     */
+    @PreAuthorize("@ss.hasPermi('item:failedMatch:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FailedMatchItem failedMatchItem) {
+        startPage();
+        List<FailedMatchItem> list = failedMatchItemService.selectFailedMatchItemList(failedMatchItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出匹配失败物品列表
+     */
+    @PreAuthorize("@ss.hasPermi('item:failedMatch:export')")
+    @Log(title = "匹配失败物品", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FailedMatchItem failedMatchItem) {
+        List<FailedMatchItem> list = failedMatchItemService.selectFailedMatchItemList(failedMatchItem);
+        ExcelUtil<FailedMatchItem> util = new ExcelUtil<FailedMatchItem>(FailedMatchItem.class);
+        util.exportExcel(response, list, "匹配失败物品数据");
+    }
+
+    /**
+     * 获取匹配失败物品详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id) {
+        return success(failedMatchItemService.selectFailedMatchItemById(id));
+    }
+
+    /**
+     * 新增匹配失败物品
+     */
+    @PreAuthorize("@ss.hasPermi('item:failedMatch:add')")
+    @Log(title = "匹配失败物品", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FailedMatchItem failedMatchItem) {
+        return toAjax(failedMatchItemService.insertFailedMatchItem(failedMatchItem));
+    }
+
+    /**
+     * 修改匹配失败物品
+     */
+    @PreAuthorize("@ss.hasPermi('item:failedMatch:edit')")
+    @Log(title = "匹配失败物品", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FailedMatchItem failedMatchItem) {
+        return toAjax(failedMatchItemService.updateFailedMatchItem(failedMatchItem));
+    }
+
+    /**
+     * 标记匹配失败物品为已编辑（App端提交后调用）
+     */
+    @Log(title = "标记匹配失败物品为已编辑", businessType = BusinessType.UPDATE)
+    @PutMapping("/markEdited/{id}")
+    public AjaxResult markEdited(@PathVariable Integer id, @RequestBody Map<String, Object> params) {
+        // 创建更新对象
+        FailedMatchItem failedMatchItem = new FailedMatchItem();
+        failedMatchItem.setId(id);
+
+        // 设置基本字段
+        if (params.containsKey("name") && params.get("name") != null) {
+            failedMatchItem.setName(params.get("name").toString());
+        }
+        if (params.containsKey("categoryCode") && params.get("categoryCode") != null) {
+            failedMatchItem.setCategoryCode(params.get("categoryCode").toString());
+        }
+        if (params.containsKey("categoryName") && params.get("categoryName") != null) {
+            failedMatchItem.setCategoryName(params.get("categoryName").toString());
+        }
+        if (params.containsKey("extractedQuantity") && params.get("extractedQuantity") != null) {
+            failedMatchItem.setExtractedQuantity(params.get("extractedQuantity").toString());
+        }
+        if (params.containsKey("extractedLocation") && params.get("extractedLocation") != null) {
+            failedMatchItem.setExtractedLocation(params.get("extractedLocation").toString());
+        }
+        if (params.containsKey("teamId") && params.get("teamId") != null) {
+            failedMatchItem.setTeamId(Long.valueOf(params.get("teamId").toString()));
+        }
+        if (params.containsKey("teamName") && params.get("teamName") != null) {
+            failedMatchItem.setTeamName(params.get("teamName").toString());
+        }
+        if (params.containsKey("checkPointId") && params.get("checkPointId") != null) {
+            failedMatchItem.setCheckPointId(Integer.valueOf(params.get("checkPointId").toString()));
+        }
+        if (params.containsKey("checkPointName") && params.get("checkPointName") != null) {
+            failedMatchItem.setCheckPointName(params.get("checkPointName").toString());
+        }
+        if (params.containsKey("isActiveConcealment") && params.get("isActiveConcealment") != null) {
+            failedMatchItem.setIsActiveConcealment(Integer.valueOf(params.get("isActiveConcealment").toString()));
+        }
+
+        // 处理 postCode：通过 postCode 查询 sys_post 表获取 position_id 和 position_name
+        if (params.containsKey("postCode") && params.get("postCode") != null) {
+            String postCode = params.get("postCode").toString();
+            SysPost post = new SysPost();
+            post.setPostCode(postCode);
+            List<SysPost> postList = sysPostService.selectPostList(post);
+            if (postList != null && !postList.isEmpty()) {
+                SysPost foundPost = postList.get(0);
+                failedMatchItem.setPositionId(foundPost.getPostId());
+                failedMatchItem.setPositionName(foundPost.getPostName());
+            }
+        }
+
+        // 处理查获位置三层结构：航站楼、区域、通道
+        // terminalId, regionalId, channelId 前端传的是 base_position 的 code 字段
+        // 需要查询 base_position 表获取对应的 id 和 name
+        if (params.containsKey("terminalId") && params.get("terminalId") != null && !params.get("terminalId").toString().isEmpty()) {
+            String terminalCode = params.get("terminalId").toString();
+            BasePosition terminalQuery = new BasePosition();
+            terminalQuery.setCode(terminalCode);
+            List<BasePosition> terminalList = basePositionService.selectBasePositionList(terminalQuery);
+            if (terminalList != null && !terminalList.isEmpty()) {
+                BasePosition terminal = terminalList.get(0);
+                failedMatchItem.setTerminalId(terminal.getId());
+                failedMatchItem.setTerminalName(terminal.getName());
+            }
+        }
+
+        if (params.containsKey("regionalId") && params.get("regionalId") != null && !params.get("regionalId").toString().isEmpty()) {
+            String regionalCode = params.get("regionalId").toString();
+            BasePosition regionalQuery = new BasePosition();
+            regionalQuery.setCode(regionalCode);
+            List<BasePosition> regionalList = basePositionService.selectBasePositionList(regionalQuery);
+            if (regionalList != null && !regionalList.isEmpty()) {
+                BasePosition regional = regionalList.get(0);
+                failedMatchItem.setRegionalId(regional.getId());
+                failedMatchItem.setRegionalName(regional.getName());
+            }
+        }
+
+        if (params.containsKey("channelId") && params.get("channelId") != null && !params.get("channelId").toString().isEmpty()) {
+            String channelCode = params.get("channelId").toString();
+            BasePosition channelQuery = new BasePosition();
+            channelQuery.setCode(channelCode);
+            List<BasePosition> channelList = basePositionService.selectBasePositionList(channelQuery);
+            if (channelList != null && !channelList.isEmpty()) {
+                BasePosition channel = channelList.get(0);
+                failedMatchItem.setChannelId(channel.getId());
+                failedMatchItem.setChannelName(channel.getName());
+            }
+        }
+
+        // 标记为已编辑
+        failedMatchItem.setAppEdited(true);
+
+        // 更新记录
+        return toAjax(failedMatchItemService.updateFailedMatchItem(failedMatchItem));
+    }
+
+    /**
+     * 删除匹配失败物品
+     */
+//    @PreAuthorize("@ss.hasPermi('item:failedMatch:remove')")
+    @Log(title = "匹配失败物品", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids) {
+        return toAjax(failedMatchItemService.deleteFailedMatchItemByIds(ids));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/item/ItemLargeScreenController.java

@@ -0,0 +1,161 @@
+package com.sundot.airport.web.controller.item;
+
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.item.domain.*;
+import com.sundot.airport.item.service.ItemLargeScreenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 查获大屏Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-25
+ */
+@RestController
+@RequestMapping("/item/largeScreen")
+public class ItemLargeScreenController extends BaseController {
+
+    @Autowired
+    private ItemLargeScreenService itemLargeScreenService;
+
+    /**
+     * 移交公安情况
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/police")
+    public AjaxResult police(BaseLargeScreenQueryParamDto dto) {
+        List<ItemLargeScreenInfoDto> result = itemLargeScreenService.police(dto);
+        return success(result);
+    }
+
+    /**
+     * 故意隐匿情况
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/conceal")
+    public AjaxResult conceal(BaseLargeScreenQueryParamDto dto) {
+        List<ItemLargeScreenInfoDto> result = itemLargeScreenService.conceal(dto);
+        return success(result);
+    }
+
+    /**
+     * 查获类别分布
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/category")
+    public AjaxResult category(BaseLargeScreenQueryParamDto dto) {
+        List<ItemLargeScreenCommonDto> result = itemLargeScreenService.category(dto);
+        return success(result);
+    }
+
+    /**
+     * 查获岗位分布
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/post")
+    public AjaxResult post(BaseLargeScreenQueryParamDto dto) {
+        List<ItemLargeScreenCommonDto> result = itemLargeScreenService.post(dto);
+        return success(result);
+    }
+
+    /**
+     * 查获总数量+移交公安数量+故意隐匿数量
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/getTotalSome")
+    public AjaxResult getTotalSome(BaseLargeScreenQueryParamDto dto) {
+        ItemLargeScreenTotalSomeDto result = itemLargeScreenService.getTotalSome(dto);
+        return success(result);
+    }
+
+    /**
+     * app端查获总数量+移交公安数量+故意隐匿数量
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/getAppTotalSome")
+    public AjaxResult getAppTotalSome(BaseLargeScreenQueryParamDto dto) {
+        ItemLargeScreenTotalSomeDto result = itemLargeScreenService.getAppTotalSome(dto);
+        return success(result);
+    }
+
+    /**
+     * PC端-查获总数+移交公安+隐匿携带(不需要完成审核)
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/getPcTotalSome")
+    public AjaxResult getPcTotalSome(BaseLargeScreenQueryParamDto dto) {
+        ItemLargeScreenTotalSomeDto result = itemLargeScreenService.getPcTotalSome(dto);
+        return success(result);
+    }
+
+    /**
+     * 查获排名
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/rank")
+    public AjaxResult rank(BaseLargeScreenQueryParamDto dto, int type) {
+        List<ItemLargeScreenCommonDto> result = itemLargeScreenService.rank(dto, type);
+        return success(result);
+    }
+
+    /**
+     * 查获时段分布
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/timeSpan")
+    public AjaxResult timeSpan(BaseLargeScreenQueryParamDto dto) {
+        List<ItemLargeScreenTimeSpanDto> result = itemLargeScreenService.timeSpan(dto);
+        return success(result);
+    }
+
+    /**
+     * 查获时段分布
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/appTimeSpan")
+    public AjaxResult appTimeSpan(BaseLargeScreenQueryParamDto dto) {
+        List<ItemLargeScreenTimeSpanDto> result = itemLargeScreenService.appTimeSpan(dto);
+        return success(result);
+    }
+
+    /**
+     * 查获位置分布
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/position")
+    public AjaxResult position(BaseLargeScreenQueryParamDto dto) {
+        List<ItemLargeScreenPositionDto> result = itemLargeScreenService.position(dto);
+        return success(result);
+    }
+
+    /**
+     * app端 查获位置分布
+     *
+     * @param dto 大屏查询参数
+     * @return 查获位置分布
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/appPosition")
+    public AjaxResult appPosition(BaseLargeScreenQueryParamDto dto) {
+        List<ItemLargeScreenPositionAppDto> result = itemLargeScreenService.appPosition(dto);
+        return success(result);
+    }
+
+    /**
+     * 查获通道分布
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/channel")
+    public AjaxResult channel(BaseLargeScreenQueryParamDto dto) {
+        List<ItemLargeScreenChannelDto> result = itemLargeScreenService.channel(dto);
+        return success(result);
+    }
+
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/item/ItemSeizureItemsController.java

@@ -0,0 +1,280 @@
+package com.sundot.airport.web.controller.item;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.enums.PostTypeEnum;
+import com.sundot.airport.item.domain.*;
+import com.sundot.airport.system.domain.SysPost;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysPostService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.item.service.IItemSeizureItemsService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 查获物品明细Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-10
+ */
+@RestController
+@RequestMapping("/item/items")
+public class ItemSeizureItemsController extends BaseController {
+    @Autowired
+    private ISysPostService sysPostService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+    @Autowired
+    private IItemSeizureItemsService itemSeizureItemsService;
+
+    /**
+     * 查询查获物品明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('item:items:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ItemSeizureItems itemSeizureItems) {
+        startPage();
+        List<ItemSeizureItems> list = itemSeizureItemsService.selectItemSeizureItemsList(itemSeizureItems);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出查获物品明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('item:items:export')")
+    @Log(title = "查获物品明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ItemSeizureItems itemSeizureItems) {
+        List<ItemSeizureItems> list = itemSeizureItemsService.selectItemSeizureItemsList(itemSeizureItems);
+        ExcelUtil<ItemSeizureItems> util = new ExcelUtil<ItemSeizureItems>(ItemSeizureItems.class);
+        util.exportExcel(response, list, "查获物品明细数据");
+    }
+
+    /**
+     * 获取查获物品明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('item:items:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(itemSeizureItemsService.selectItemSeizureItemsById(id));
+    }
+
+    /**
+     * 新增查获物品明细
+     */
+    @PreAuthorize("@ss.hasPermi('item:items:add')")
+    @Log(title = "查获物品明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ItemSeizureItems itemSeizureItems) {
+        itemSeizureItems.setCreateBy(getUsername());
+        return toAjax(itemSeizureItemsService.insertItemSeizureItems(itemSeizureItems));
+    }
+
+    /**
+     * 修改查获物品明细
+     */
+    @PreAuthorize("@ss.hasPermi('item:items:edit')")
+    @Log(title = "查获物品明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ItemSeizureItems itemSeizureItems) {
+        itemSeizureItems.setUpdateBy(getUsername());
+        return toAjax(itemSeizureItemsService.updateItemSeizureItems(itemSeizureItems));
+    }
+
+    /**
+     * 删除查获物品明细
+     */
+    @PreAuthorize("@ss.hasPermi('item:items:remove')")
+    @Log(title = "查获物品明细", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(itemSeizureItemsService.deleteItemSeizureItemsByIds(ids));
+    }
+
+    /**
+     * 根据记录ID查询查获物品明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('item:items:list')")
+    @GetMapping("/listByRecorId")
+    public AjaxResult listByRecorId(Long recordId) {
+        return success(itemSeizureItemsService.listByRecorId(recordId));
+    }
+
+    /**
+     * 根据筛选条件查询查获物品明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('item:items:list')")
+    @GetMapping("/selectByConditions")
+    public TableDataInfo selectByConditions(ItemSeizureParam itemSeizureParam) {
+        if (itemSeizureParam.getRecordType() == 1) {
+            itemSeizureParam.setInspectUserId(getUserId());
+        } else {
+            itemSeizureParam.setInspectUserId(null);
+            List<Long> userPostList = sysPostService.selectPostListByUserId(getUserId());
+            SysDept sysDept = sysDeptService.selectDeptById(getDeptId());
+            if (CollectionUtils.isEmpty(userPostList) || ObjectUtils.isEmpty(sysDept)) {
+                itemSeizureParam.setInspectUserId(getUserId());
+            } else {
+                if (sysDept.getDeptType().equals(DeptTypeEnum.STATION.getCode())) {
+                    itemSeizureParam.setInspectStationId(sysDept.getDeptId());
+                } else if (sysDept.getDeptType().equals(DeptTypeEnum.BRIGADE.getCode())) {
+                    itemSeizureParam.setInspectBrigadeId(sysDept.getDeptId());
+                } else if (sysDept.getDeptType().equals(DeptTypeEnum.MANAGER.getCode())) {
+                    itemSeizureParam.setInspectDepartmentId(sysDept.getDeptId());
+                } else if (sysDept.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())) {
+                    itemSeizureParam.setInspectTeamId(sysDept.getDeptId());
+                } else {
+                    itemSeizureParam.setInspectUserId(getUserId());
+                }
+//                List<SysPost> sysPostList = sysPostService.selectPostAll();
+//                sysPostList = sysPostList.stream().filter(sysPost -> userPostList.contains(sysPost.getPostId())).collect(Collectors.toList());
+//                PostTypeEnum typeEnum = sysPostList.stream()
+//                        .map(item -> {
+//                            String postCode = item.getPostCode();
+//                            return postCode != null ? PostTypeEnum.getByCode(postCode) : null;
+//                        })
+//                        .filter(java.util.Objects::nonNull)
+//                        .min(Comparator.comparingInt(PostTypeEnum::getLevel))
+//                        .orElse(null);
+//                if (typeEnum == null || typeEnum == PostTypeEnum.security_inspector) {
+//                    itemSeizureParam.setInspectUserId(getUserId());
+//                } else {
+//                    if (sysDept.getDeptType().equals(DeptTypeEnum.STATION.getCode())) {
+//                        itemSeizureParam.setInspectStationId(sysDept.getDeptId());
+//                    } else if (sysDept.getDeptType().equals(DeptTypeEnum.DEPARTMENT.getCode())) {
+//                        itemSeizureParam.setInspectDepartmentId(sysDept.getDeptId());
+//                    } else if (sysDept.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())) {
+//                        itemSeizureParam.setInspectTeamId(sysDept.getDeptId());
+//                    } else {
+//                        itemSeizureParam.setInspectUserId(getUserId());
+//                    }
+//                }
+            }
+        }
+        startPage();
+        List<ItemSeizureDto> list = itemSeizureItemsService.selectByConditions(itemSeizureParam);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据筛选条件查询分类数量
+     */
+    @PreAuthorize("@ss.hasPermi('item:items:list')")
+    @GetMapping("/selectGroupCount")
+    public AjaxResult selectGroupCount(ItemSeizureParam itemSeizureParam) {
+        if (itemSeizureParam.getRecordType() == 1) {
+            itemSeizureParam.setInspectUserId(getUserId());
+        } else {
+            itemSeizureParam.setInspectUserId(null);
+            List<Long> userPostList = sysPostService.selectPostListByUserId(getUserId());
+            SysDept sysDept = sysDeptService.selectDeptById(getDeptId());
+            if (CollectionUtils.isEmpty(userPostList) || ObjectUtils.isEmpty(sysDept)) {
+                itemSeizureParam.setInspectUserId(getUserId());
+            } else {
+                List<SysPost> sysPostList = sysPostService.selectPostAll();
+                sysPostList = sysPostList.stream().filter(sysPost -> userPostList.contains(sysPost.getPostId())).collect(Collectors.toList());
+                PostTypeEnum typeEnum = sysPostList.stream()
+                        .map(item -> {
+                            String postCode = item.getPostCode();
+                            return postCode != null ? PostTypeEnum.getByCode(postCode) : null;
+                        })
+                        .filter(java.util.Objects::nonNull)
+                        .min(Comparator.comparingInt(PostTypeEnum::getLevel))
+                        .orElse(null);
+                if (typeEnum == null || typeEnum == PostTypeEnum.security_inspector) {
+                    itemSeizureParam.setInspectUserId(getUserId());
+                } else {
+                    if (sysDept.getDeptType().equals(DeptTypeEnum.STATION.getCode())) {
+                        itemSeizureParam.setInspectStationId(sysDept.getDeptId());
+                    } else if (sysDept.getDeptType().equals(DeptTypeEnum.BRIGADE.getCode())) {
+                        itemSeizureParam.setInspectBrigadeId(sysDept.getDeptId());
+                    } else if (sysDept.getDeptType().equals(DeptTypeEnum.MANAGER.getCode())) {
+                        itemSeizureParam.setInspectDepartmentId(sysDept.getDeptId());
+                    } else if (sysDept.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())) {
+                        itemSeizureParam.setInspectTeamId(sysDept.getDeptId());
+                    } else {
+                        itemSeizureParam.setInspectUserId(getUserId());
+                    }
+                }
+            }
+        }
+        List<ItemSeizureCount> list = itemSeizureItemsService.selectGroupCount(itemSeizureParam);
+        return success(list);
+    }
+
+    /**
+     * 根据筛选条件查询数量
+     */
+    @PreAuthorize("@ss.hasPermi('item:items:list')")
+    @GetMapping("/selectCount")
+    public AjaxResult selectCount(ItemSeizureParam itemSeizureParam) {
+        if (itemSeizureParam.getRecordType() == 1) {
+            itemSeizureParam.setInspectUserId(getUserId());
+        } else {
+            itemSeizureParam.setInspectUserId(null);
+            List<Long> userPostList = sysPostService.selectPostListByUserId(getUserId());
+            SysDept sysDept = sysDeptService.selectDeptById(getDeptId());
+            if (CollectionUtils.isEmpty(userPostList) || ObjectUtils.isEmpty(sysDept)) {
+                itemSeizureParam.setInspectUserId(getUserId());
+            } else {
+                if (sysDept.getDeptType().equals(DeptTypeEnum.STATION.getCode())) {
+                    itemSeizureParam.setInspectStationId(sysDept.getDeptId());
+                } else if (sysDept.getDeptType().equals(DeptTypeEnum.BRIGADE.getCode())) {
+                    itemSeizureParam.setInspectBrigadeId(sysDept.getDeptId());
+                } else if (sysDept.getDeptType().equals(DeptTypeEnum.MANAGER.getCode())) {
+                    itemSeizureParam.setInspectDepartmentId(sysDept.getDeptId());
+                } else if (sysDept.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())) {
+                    itemSeizureParam.setInspectTeamId(sysDept.getDeptId());
+                } else {
+                    itemSeizureParam.setInspectUserId(getUserId());
+                }
+//                List<SysPost> sysPostList = sysPostService.selectPostAll();
+//                sysPostList = sysPostList.stream().filter(sysPost -> userPostList.contains(sysPost.getPostId())).collect(Collectors.toList());
+//                PostTypeEnum typeEnum = sysPostList.stream()
+//                        .map(item -> {
+//                            String postCode = item.getPostCode();
+//                            return postCode != null ? PostTypeEnum.getByCode(postCode) : null;
+//                        })
+//                        .filter(java.util.Objects::nonNull)
+//                        .min(Comparator.comparingInt(PostTypeEnum::getLevel))
+//                        .orElse(null);
+//                if (typeEnum == null || typeEnum == PostTypeEnum.security_inspector) {
+//                    itemSeizureParam.setInspectUserId(getUserId());
+//                } else {
+//                    if (sysDept.getDeptType().equals(DeptTypeEnum.STATION.getCode())) {
+//                        itemSeizureParam.setInspectStationId(sysDept.getDeptId());
+//                    } else if (sysDept.getDeptType().equals(DeptTypeEnumDeptTypeEnumDeptTypeEnumDeptTypeEnum)) {
+//                        itemSeizureParam.setInspectDepartmentId(sysDept.getDeptId());
+//                    } else if (sysDept.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())) {
+//                        itemSeizureParam.setInspectTeamId(sysDept.getDeptId());
+//                    } else {
+//                        itemSeizureParam.setInspectUserId(getUserId());
+//                    }
+//                }
+            }
+        }
+        ItemSeizureTotal result = itemSeizureItemsService.selectCount(itemSeizureParam);
+        return success(result);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/item/ItemSeizureRecordController.java

@@ -0,0 +1,270 @@
+package com.sundot.airport.web.controller.item;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.sundot.airport.common.dto.UserInfo;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.DictUtils;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.web.core.utils.DataPermissionUtils;
+import com.sundot.airport.item.domain.ItemSeizureItems;
+import com.sundot.airport.item.domain.ItemSeizureRecordDTO;
+import com.sundot.airport.item.domain.vo.ItemSeizureRecordExportVO;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysPostService;
+import com.sundot.airport.web.core.cache.UserCache;
+import com.sundot.airport.common.core.domain.DataPermissionResult;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.item.domain.ItemSeizureRecord;
+import com.sundot.airport.item.service.IItemSeizureRecordService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 查获记录Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/item/record")
+public class ItemSeizureRecordController extends BaseController {
+    @Autowired
+    private UserCache userCache;
+    @Autowired
+    private ISysPostService sysPostService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+    @Autowired
+    private IItemSeizureRecordService itemSeizureRecordService;
+
+    /**
+     * 查询查获记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ItemSeizureRecordDTO itemSeizureRecord) {
+        // 应用数据权限过滤
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case SELF:
+                itemSeizureRecord.setInspectUserId(dataPermission.getValue());
+                break;
+            case STATION:
+                itemSeizureRecord.setInspectStationId(dataPermission.getValue());
+                break;
+            case BRIGADE:
+                itemSeizureRecord.setInspectBrigadeId(dataPermission.getValue());
+                break;
+            case DEPARTMENT:
+                itemSeizureRecord.setInspectDepartmentId(dataPermission.getValue());
+                break;
+            case TEAM:
+                itemSeizureRecord.setInspectTeamId(dataPermission.getValue());
+                break;
+            case ALL:
+            default:
+                // 不设置过滤条件，查看所有数据
+                break;
+        }
+
+        startPage();
+        List<ItemSeizureRecord> list = itemSeizureRecordService.selectItemSeizureRecordList(itemSeizureRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出查获记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:export')")
+    @Log(title = "查获记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ItemSeizureRecordDTO itemSeizureRecord) {
+        // 应用数据权限过滤
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case SELF:
+                itemSeizureRecord.setInspectUserId(dataPermission.getValue());
+                break;
+            case STATION:
+                itemSeizureRecord.setInspectStationId(dataPermission.getValue());
+                break;
+            case BRIGADE:
+                itemSeizureRecord.setInspectBrigadeId(dataPermission.getValue());
+                break;
+            case DEPARTMENT:
+                itemSeizureRecord.setInspectDepartmentId(dataPermission.getValue());
+                break;
+            case TEAM:
+                itemSeizureRecord.setInspectTeamId(dataPermission.getValue());
+                break;
+            case ALL:
+            default:
+                // 不设置过滤条件，查看所有数据
+                break;
+        }
+
+        List<ItemSeizureRecord> list = itemSeizureRecordService.selectItemSeizureRecordListForExport(itemSeizureRecord);
+        exportData(response, list);
+    }
+
+    /**
+     * 导出查获记录数据
+     *
+     * @param response 响应对象
+     * @param list     查获记录列表
+     */
+    private void exportData(HttpServletResponse response, List<ItemSeizureRecord> list) {
+        List<ItemSeizureRecordExportVO> exportList = new ArrayList<>();
+
+        // 直接使用已查询到的记录，避免再次查询数据库
+        for (ItemSeizureRecord record : list) {
+            if (record != null) {
+                // 处理没有物品的记录
+                if (record.getItemSeizureItemsList() == null || record.getItemSeizureItemsList().isEmpty()) {
+                    ItemSeizureRecordExportVO exportVO = new ItemSeizureRecordExportVO();
+                    // 基本信息
+                    exportVO.setInspectUserName(record.getInspectUserName());
+                    exportVO.setSeizureTime(record.getSeizureTime());
+                    StringBuilder sb = new StringBuilder();
+                    if (StringUtils.isNotEmpty(record.getTerminlName())) {
+                        sb.append(record.getTerminlName()).append("/");
+                    }
+                    if (StringUtils.isNotEmpty(record.getRegionalName())) {
+                        sb.append(record.getRegionalName()).append("/");
+                    }
+                    if (StringUtils.isNotEmpty(record.getChannelName())) {
+                        sb.append(record.getChannelName());
+                    }
+                    exportVO.setChannelName(sb.toString());
+                    exportVO.setCheckMethodDesc(record.getCheckMethodDesc());
+                    exportVO.setInspectTeamName(record.getInspectTeamName());
+                    exportVO.setAttendanceTeamName(record.getAttendanceTeamName());
+                    exportVO.setPowerOnInstruction(record.getPowerOnInstruction());
+                    exportVO.setXrayOperator(record.getXrayOperatorName());
+                    exportVO.setProcessStatus(record.getProcessStatus());
+
+                    // 物品信息为空
+                    exportVO.setCategoryNameTwo("");
+                    exportVO.setQuantity(null);
+                    exportVO.setCheckPositionNameTwo("");
+                    exportVO.setHandlingMethod("");
+                    exportVO.setIsActiveConcealmentDesc("");
+                    exportVO.setCommonContraband(null);
+                    exportVO.setContrabandDesc("");
+                    exportList.add(exportVO);
+                } else {
+                    // 处理有物品的记录
+                    for (ItemSeizureItems item : record.getItemSeizureItemsList()) {
+                        ItemSeizureRecordExportVO exportVO = new ItemSeizureRecordExportVO();
+                        // 基本信息
+                        exportVO.setInspectUserName(record.getInspectUserName());
+                        exportVO.setSeizureTime(record.getSeizureTime());
+                        StringBuilder sb = new StringBuilder();
+                        if (StringUtils.isNotEmpty(record.getTerminlName())) {
+                            sb.append(record.getTerminlName()).append("/");
+                        }
+                        if (StringUtils.isNotEmpty(record.getRegionalName())) {
+                            sb.append(record.getRegionalName()).append("/");
+                        }
+                        if (StringUtils.isNotEmpty(record.getChannelName())) {
+                            sb.append(record.getChannelName());
+                        }
+                        exportVO.setChannelName(sb.toString());
+                        exportVO.setCheckMethodDesc(record.getCheckMethodDesc());
+                        exportVO.setInspectTeamName(record.getInspectTeamName());
+                        exportVO.setAttendanceTeamName(record.getAttendanceTeamName());
+                        exportVO.setPowerOnInstruction(record.getPowerOnInstruction());
+                        exportVO.setXrayOperator(record.getXrayOperatorName());
+                        exportVO.setProcessStatus(record.getProcessStatus());
+
+                        // 物品信息
+                        exportVO.setCategoryNameTwo(item.getCategoryNameOne() + "/" + item.getCategoryNameTwo());
+                        exportVO.setQuantity(item.getQuantity());
+                        exportVO.setCheckPositionNameTwo(item.getCheckPositionNameOne() + "/" + item.getCheckPositionNameTwo());
+                        //处理方式查字典
+                        String handlingMethodLabel = DictUtils.getDictLabel("item_handling_method", item.getHandlingMethod());
+                        exportVO.setHandlingMethod(StringUtils.isNotEmpty(handlingMethodLabel) ? handlingMethodLabel : item.getHandlingMethod());
+                        exportVO.setIsActiveConcealmentDesc("1".equals(String.valueOf(item.getIsActiveConcealment())) ? "是" : "否");
+                        exportVO.setCommonContraband(item.getCommonContraband());
+                        exportVO.setContrabandDesc(item.getContrabandDesc());
+                        exportList.add(exportVO);
+                    }
+                }
+            }
+        }
+
+        ExcelUtil<ItemSeizureRecordExportVO> util = new ExcelUtil<ItemSeizureRecordExportVO>(ItemSeizureRecordExportVO.class);
+        util.exportExcel(response, exportList, "查获记录数据");
+    }
+
+    /**
+     * 获取查获记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(itemSeizureRecordService.selectItemSeizureRecordById(id));
+    }
+
+    /**
+     * 新增查获记录
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:add')")
+    @Log(title = "查获记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody ItemSeizureRecord itemSeizureRecord) {
+        itemSeizureRecord.setCreateBy(getUsername());
+        UserInfo userInfo = userCache.getUserInfo(itemSeizureRecord.getInspectUserId());
+        if (ObjectUtil.isNull(userInfo) || ObjectUtil.isNull(userInfo.getStationId()) || ObjectUtil.isNull(userInfo.getDepartmentId()) || ObjectUtil.isNull(userInfo.getTeamsId())) {
+            throw new ServiceException("操作失败,检查人员非班组成员");
+        }
+        itemSeizureRecord.setInspectStationId(userInfo.getStationId());
+        itemSeizureRecord.setInspectStationName(userInfo.getStationName());
+        itemSeizureRecord.setInspectBrigadeId(userInfo.getBrigadeId());
+        itemSeizureRecord.setInspectBrigadeName(userInfo.getBrigadeName());
+        itemSeizureRecord.setInspectDepartmentId(userInfo.getDepartmentId());
+        itemSeizureRecord.setInspectDepartmentName(userInfo.getDepartmentName());
+        itemSeizureRecord.setInspectTeamId(userInfo.getTeamsId());
+        itemSeizureRecord.setInspectTeamName(userInfo.getTeamsName());
+        itemSeizureRecord.getItemSeizureItemsList().forEach(itemSeizureItems -> itemSeizureItems.setCreateBy(getUsername()));
+        return success(itemSeizureRecordService.insertItemSeizureRecord(itemSeizureRecord));
+    }
+
+    /**
+     * 修改查获记录
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:edit')")
+    @Log(title = "查获记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ItemSeizureRecord itemSeizureRecord) {
+        itemSeizureRecord.setUpdateBy(getUsername());
+        return toAjax(itemSeizureRecordService.updateItemSeizureRecord(itemSeizureRecord));
+    }
+
+    /**
+     * 删除查获记录
+     */
+    @PreAuthorize("@ss.hasPermi('item:record:remove')")
+    @Log(title = "查获记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(itemSeizureRecordService.deleteItemSeizureRecordByIds(ids));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/item/PerformanceIndicatorsController.java

@@ -0,0 +1,556 @@
+package com.sundot.airport.web.controller.item;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.dto.*;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.utils.DeptUtils;
+import com.sundot.airport.common.utils.GeometricMeanUtils;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.system.domain.SysConfig;
+import com.sundot.airport.system.mapper.SysUserMapper;
+import com.sundot.airport.system.service.ISysConfigService;
+import com.sundot.airport.system.service.ISysDeptService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 绩效指标管理 Controller
+ *
+ * @author sundot
+ * @date 2026-03-16
+ */
+@Slf4j
+@RestController
+@RequestMapping("/item/indicators")
+@Api(tags = "绩效指标管理")
+public class PerformanceIndicatorsController extends BaseController {
+
+    @Autowired
+    private ISysConfigService configService;
+
+    @Autowired
+    private PerformanceMetricsController performanceMetricsController;
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+
+    // 绩效矩阵参数的配置键名
+    private static final String CONFIG_KEY_PARAM_A = "item.performance.matrix.param_a";
+    private static final String CONFIG_KEY_PARAM_B = "item.performance.matrix.param_b";
+    private static final String CONFIG_KEY_PARAM_C = "item.performance.matrix.param_c";
+
+
+    /**
+     * 保存绩效矩阵
+     * 保存前端传入的绩效矩阵参数 a、b、c
+     * 默认值 a=3, b=5, c=2
+     *
+     * @param a
+     * @param b
+     * @param c
+     * @return 保存结果
+     */
+    @GetMapping("/matrix/add")
+    public AjaxResult performanceMatrix(
+            @RequestParam(value = "a", defaultValue = "3") BigDecimal a,
+            @RequestParam(value = "b", defaultValue = "5") BigDecimal b,
+            @RequestParam(value = "c", defaultValue = "2") BigDecimal c) {
+
+        try {
+            // 保存到 sys_config 表
+            saveConfig(CONFIG_KEY_PARAM_A, "绩效矩阵参数 a", a.toString());
+            saveConfig(CONFIG_KEY_PARAM_B, "绩效矩阵参数 b", b.toString());
+            saveConfig(CONFIG_KEY_PARAM_C, "绩效矩阵参数 c", c.toString());
+
+            // 同步更新到 GeometricMeanUtils
+            GeometricMeanUtils.setParams(a.doubleValue(), b.doubleValue(), c.doubleValue());
+
+            return success("保存成功");
+        } catch (Exception e) {
+            log.error("保存绩效矩阵参数失败：{}", e.getMessage());
+            return error("保存失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取绩效矩阵参数配置
+     *
+     * @return 绩效矩阵参数配置
+     */
+    @GetMapping("/matrix/config")
+    public AjaxResult getMatrixConfig() {
+        try {
+            String paramA = configService.selectConfigByKey(CONFIG_KEY_PARAM_A);
+            String paramB = configService.selectConfigByKey(CONFIG_KEY_PARAM_B);
+            String paramC = configService.selectConfigByKey(CONFIG_KEY_PARAM_C);
+
+            // 如果不存在，返回默认值
+            if (paramA == null || paramA.isEmpty()) paramA = "3";
+            if (paramB == null || paramB.isEmpty()) paramB = "5";
+            if (paramC == null || paramC.isEmpty()) paramC = "2";
+
+            Map<String, Object> result = new HashMap<>();
+            result.put("paramA", new BigDecimal(paramA));
+            result.put("paramB", new BigDecimal(paramB));
+            result.put("paramC", new BigDecimal(paramC));
+
+            return success(result);
+        } catch (Exception e) {
+            log.error("获取绩效矩阵参数失败：{}", e.getMessage());
+            return error("获取失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 绩效查询
+     * 调用现有的 /metrics 接口获取绩效数据
+     *
+     * @param param 查询参数
+     * @return 绩效数据列表
+     */
+    @GetMapping("/query")
+    public AjaxResult queryPerformance(PerformanceMetricsParamDto param) {
+        try {
+            // 设置默认值
+            if (param.getDimension() == null) {
+                param.setDimension(4); // 默认查询大队
+            }
+            if (param.getSortOrder() == null) {
+                param.setSortOrder(2); // 默认降序
+            }
+
+            return performanceMetricsController.getPerformanceMetrics(param);
+        } catch (Exception e) {
+            log.error("绩效查询失败：{}", e.getMessage());
+            return AjaxResult.error("查询失败：" + e.getMessage());
+        }
+    }
+
+
+    /**
+     * 导出绩效数据
+     * 根据维度不同导出不同的内容
+     *
+     * @param response HTTP 响应
+     * @param param    查询参数
+     */
+    @GetMapping("/export")
+    public void exportPerformance(HttpServletResponse response, PerformanceMetricsParamDto param) {
+        // 设置默认值
+        if (param.getDimension() == null) {
+            param.setDimension(4); // 默认查询大队
+        }
+        if (param.getSortOrder() == null) {
+            param.setSortOrder(2); // 默认降序
+        }
+
+        // 查询绩效数据
+        AjaxResult result = performanceMetricsController.getPerformanceMetrics(param);
+        List<PerformanceMetricsResultDto> dataList = (List<PerformanceMetricsResultDto>) result.get("data");
+
+        String fileName = "绩效数据";
+
+        // 根据维度转换数据
+        if (param.getDimension() == 1) {
+            // 人员维度 - 导出个人绩效（包含姓名、班组名、科室名、大队名）
+            List<PerformanceMetricsPersonalExportDto> exportList = convertToPersonalExportList(dataList, param.getStartTime(), param.getEndTime());
+            ExcelUtil<PerformanceMetricsPersonalExportDto> util = new ExcelUtil<>(PerformanceMetricsPersonalExportDto.class);
+            util.exportExcel(response, exportList, fileName);
+        } else if (param.getDimension() == 2) {
+            // 班组维度 - 导出班组绩效（包含班组名、科室名、大队名）
+            List<PerformanceMetricsTeamExportDto> exportList = convertToTeamExportList(dataList, param.getStartTime(), param.getEndTime());
+            ExcelUtil<PerformanceMetricsTeamExportDto> util = new ExcelUtil<>(PerformanceMetricsTeamExportDto.class);
+            util.exportExcel(response, exportList, fileName);
+        } else if (param.getDimension() == 3) {
+            // 科室维度 - 导出科室绩效（包含科室名、大队名）
+            List<PerformanceMetricsDeptExportDto> exportList = convertToDeptExportList(dataList, param.getStartTime(), param.getEndTime());
+            ExcelUtil<PerformanceMetricsDeptExportDto> util = new ExcelUtil<>(PerformanceMetricsDeptExportDto.class);
+            util.exportExcel(response, exportList, fileName);
+        } else if (param.getDimension() == 4) {
+            // 大队维度 - 导出大队绩效（仅大队名）
+            List<PerformanceMetricsBrigadeExportDto> exportList = convertToBrigadeExportList(dataList, param.getStartTime(), param.getEndTime());
+            ExcelUtil<PerformanceMetricsBrigadeExportDto> util = new ExcelUtil<>(PerformanceMetricsBrigadeExportDto.class);
+            util.exportExcel(response, exportList, fileName);
+        }
+    }
+
+    /**
+     * 班组组建
+     *
+     * @param param 组建参数
+     * @return 组建结果
+     */
+    @PostMapping("/team/build")
+    public AjaxResult teamBuild(@RequestBody TeamBuildParamDto param) {
+        try {
+            // 参数校验
+            if (param.getTeamCount() == null || param.getTeamCount() < 1 || param.getTeamCount() > 10) {
+                return error("重点班组数量必须在1-10之间");
+            }
+            if (param.getTargetSize() == null || param.getTargetSize() < 2) {
+                return error("目标班组人数至少为2人");
+            }
+            if (param.getLeaderCondition() == null || param.getLeaderCondition() < 1 || param.getLeaderCondition() > 3) {
+                return error("组建班组长条件必须为1-综合能力、2-管理能力、3-业务能力");
+            }
+
+            // 查询个人维度的绩效数据（包含班组长和安检员）
+            PerformanceMetricsParamDto metricsParam = new PerformanceMetricsParamDto();
+            metricsParam.setDimension(1); // 个人维度
+            metricsParam.setStartTime(DateUtil.parse(param.getStartTime(), "yyyy-MM-dd"));
+            metricsParam.setEndTime(DateUtil.parse(param.getEndTime(), "yyyy-MM-dd"));
+            metricsParam.setSortField("totalScore");
+            metricsParam.setSortOrder(2); // 降序
+
+            AjaxResult result = performanceMetricsController.getPerformanceMetrics(metricsParam);
+            List<PerformanceMetricsResultDto> personalMetrics = (List<PerformanceMetricsResultDto>) result.get("data");
+
+            if (personalMetrics == null || personalMetrics.isEmpty()) {
+                return error("未查询到绩效数据");
+            }
+
+            // 获取所有班组长和安检员的用户信息
+            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+            if (topSiteId == null) {
+                return error("无法找到有效的站点信息");
+            }
+
+            List<SysUser> allUsers = userMapper.selectUserByDeptId(topSiteId);
+            Map<Long, SysUser> userMap = allUsers.stream()
+                    .filter(user -> user.getRoles() != null)
+                    .filter(user -> user.getRoles().stream()
+                            .anyMatch(role -> RoleTypeEnum.banzuzhang.getCode().equals(role.getRoleKey())
+                                    || RoleTypeEnum.SecurityCheck.getCode().equals(role.getRoleKey())))
+                    .collect(Collectors.toMap(SysUser::getUserId, user -> user, (u1, u2) -> u1));
+
+            // 根据组建条件选择班组长
+            List<TeamBuildResultDto> teamResults = new ArrayList<>();
+            Set<Long> selectedUserIds = new HashSet<>(); // 记录已选中的用户
+
+            // 1. 选择班组长
+            List<TeamMemberDto> leaders = selectLeaders(param, personalMetrics, userMap);
+            if (leaders.size() < param.getTeamCount()) {
+                return error("班组长人数不足，无法组建" + param.getTeamCount() + "个重点班组");
+            }
+
+            // 2. 选择成员并分配
+            List<TeamMemberDto> members = selectMembers(param, personalMetrics, userMap, selectedUserIds);
+
+            // 3. 组建班组
+            int memberCount = param.getTargetSize() - 1; // 每个班组的成员数 = 目标人数 - 1个班组长
+            int totalMembersNeeded = param.getTeamCount() * memberCount; // 总共需要的成员数
+
+            if (members.size() < totalMembersNeeded) {
+                return error("成员人数不足，需要" + totalMembersNeeded + "人，但只有" + members.size() + "人");
+            }
+
+            // 4. 分配成员到各个班组
+            for (int i = 0; i < param.getTeamCount(); i++) {
+                TeamBuildResultDto teamResult = new TeamBuildResultDto();
+                teamResult.setTeamNo(i + 1);
+
+                List<TeamMemberDto> teamMembers = new ArrayList<>();
+                // 添加班组长
+                teamMembers.add(leaders.get(i));
+                selectedUserIds.add(leaders.get(i).getUserId());
+
+                // 随机分配成员
+                for (int j = 0; j < memberCount; j++) {
+                    int randomIndex = new Random().nextInt(members.size());
+                    TeamMemberDto member = members.remove(randomIndex);
+                    teamMembers.add(member);
+                    selectedUserIds.add(member.getUserId());
+                }
+
+                teamResult.setMembers(teamMembers);
+                teamResults.add(teamResult);
+            }
+
+            return success(teamResults);
+        } catch (Exception e) {
+            log.error("班组组建失败：{}", e.getMessage());
+            return error("班组组建失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 根据条件选择班组长
+     */
+    private List<TeamMemberDto> selectLeaders(TeamBuildParamDto param,
+                                              List<PerformanceMetricsResultDto> personalMetrics,
+                                              Map<Long, SysUser> userMap) {
+        List<TeamMemberDto> leaders = new ArrayList<>();
+
+        // 筛选出班组长角色的用户绩效数据
+        List<PerformanceMetricsResultDto> leaderMetrics = personalMetrics.stream()
+                .filter(metric -> {
+                    SysUser user = userMap.get(metric.getId());
+                    return user != null && user.getRoles().stream()
+                            .anyMatch(role -> RoleTypeEnum.banzuzhang.getCode().equals(role.getRoleKey()));
+                })
+                .collect(Collectors.toList());
+
+        Integer leaderCondition = param.getLeaderCondition();
+        if (leaderCondition == 1) {
+            // 综合能力：个人总分和班组总分之和除以2
+            // 获取班组绩效数据
+            PerformanceMetricsParamDto teamParam = new PerformanceMetricsParamDto();
+            teamParam.setDimension(2);
+            teamParam.setStartTime(DateUtil.parse(param.getStartTime(), "yyyy-MM-dd"));
+            teamParam.setEndTime(DateUtil.parse(param.getEndTime(), "yyyy-MM-dd"));
+            teamParam.setSortField("totalScore");
+            teamParam.setSortOrder(2);
+
+            AjaxResult teamResult = performanceMetricsController.getPerformanceMetrics(teamParam);
+            List<PerformanceMetricsResultDto> teamMetrics = (List<PerformanceMetricsResultDto>) teamResult.get("data");
+            Map<Long, BigDecimal> teamScoreMap = teamMetrics.stream()
+                    .collect(Collectors.toMap(PerformanceMetricsResultDto::getId, PerformanceMetricsResultDto::getTotalScore, (s1, s2) -> s1));
+
+            // 计算综合得分
+            for (PerformanceMetricsResultDto metric : leaderMetrics) {
+                SysUser user = userMap.get(metric.getId());
+                if (user != null && user.getDeptId() != null) {
+                    BigDecimal teamScore = teamScoreMap.getOrDefault(user.getDeptId(), BigDecimal.ZERO);
+                    BigDecimal comprehensiveScore = metric.getTotalScore()
+                            .add(teamScore)
+                            .divide(new BigDecimal("2"), 2, BigDecimal.ROUND_HALF_UP);
+
+                    TeamMemberDto leader = new TeamMemberDto();
+                    leader.setUserId(user.getUserId());
+                    leader.setName(user.getNickName());
+                    leader.setUserName(user.getUserName());
+                    leader.setRole("班组长");
+                    leader.setScore(comprehensiveScore);
+                    leaders.add(leader);
+                }
+            }
+
+            // 按综合得分降序排序
+            leaders.sort((a, b) -> b.getScore().compareTo(a.getScore()));
+
+        } else if (leaderCondition == 2) {
+            // 管理能力：使用班组维度的绩效总分
+            PerformanceMetricsParamDto teamParam = new PerformanceMetricsParamDto();
+            teamParam.setDimension(2);
+            teamParam.setStartTime(DateUtil.parse(param.getStartTime(), "yyyy-MM-dd"));
+            teamParam.setEndTime(DateUtil.parse(param.getEndTime(), "yyyy-MM-dd"));
+            teamParam.setSortField("totalScore");
+            teamParam.setSortOrder(2);
+
+            AjaxResult teamResult = performanceMetricsController.getPerformanceMetrics(teamParam);
+            List<PerformanceMetricsResultDto> teamMetrics = (List<PerformanceMetricsResultDto>) teamResult.get("data");
+            Map<Long, BigDecimal> teamScoreMap = teamMetrics.stream()
+                    .collect(Collectors.toMap(PerformanceMetricsResultDto::getId, PerformanceMetricsResultDto::getTotalScore, (s1, s2) -> s1));
+
+            // 获取班组长所在的班组得分
+            for (PerformanceMetricsResultDto metric : leaderMetrics) {
+                SysUser user = userMap.get(metric.getId());
+                if (user != null && user.getDeptId() != null) {
+                    BigDecimal teamScore = teamScoreMap.getOrDefault(user.getDeptId(), BigDecimal.ZERO);
+
+                    TeamMemberDto leader = new TeamMemberDto();
+                    leader.setUserId(user.getUserId());
+                    leader.setName(user.getNickName());
+                    leader.setUserName(user.getUserName());
+                    leader.setRole("班组长");
+                    leader.setScore(teamScore);
+                    leaders.add(leader);
+                }
+            }
+
+            // 按班组得分降序排序
+            leaders.sort((a, b) -> b.getScore().compareTo(a.getScore()));
+
+        } else if (leaderCondition == 3) {
+            // 业务能力：使用个人的绩效总分
+            for (PerformanceMetricsResultDto metric : leaderMetrics) {
+                SysUser user = userMap.get(metric.getId());
+                if (user != null) {
+                    TeamMemberDto leader = new TeamMemberDto();
+                    leader.setUserId(user.getUserId());
+                    leader.setName(user.getNickName());
+                    leader.setUserName(user.getUserName());
+                    leader.setRole("班组长");
+                    leader.setScore(metric.getTotalScore());
+                    leaders.add(leader);
+                }
+            }
+
+            // 按个人总分降序排序
+            leaders.sort((a, b) -> b.getScore().compareTo(a.getScore()));
+        }
+
+        // 取前 teamCount 个班组长
+        int teamCount = param.getTeamCount();
+        return leaders.subList(0, Math.min(teamCount, leaders.size()));
+    }
+
+    /**
+     * 选择成员（安检员角色）
+     */
+    private List<TeamMemberDto> selectMembers(TeamBuildParamDto param,
+                                              List<PerformanceMetricsResultDto> personalMetrics,
+                                              Map<Long, SysUser> userMap,
+                                              Set<Long> selectedUserIds) {
+        List<TeamMemberDto> members = new ArrayList<>();
+
+        // 筛选出安检员角色的用户绩效数据
+        List<PerformanceMetricsResultDto> memberMetrics = personalMetrics.stream()
+                .filter(metric -> {
+                    SysUser user = userMap.get(metric.getId());
+                    return user != null && user.getRoles().stream()
+                            .anyMatch(role -> RoleTypeEnum.SecurityCheck.getCode().equals(role.getRoleKey()));
+                })
+                .collect(Collectors.toList());
+
+        // 转换为成员DTO
+        for (PerformanceMetricsResultDto metric : memberMetrics) {
+            if (selectedUserIds.contains(metric.getId())) {
+                continue; // 跳过已选中的用户
+            }
+
+            SysUser user = userMap.get(metric.getId());
+            if (user != null) {
+                TeamMemberDto member = new TeamMemberDto();
+                member.setUserId(user.getUserId());
+                member.setName(user.getNickName());
+                member.setUserName(user.getUserName());
+                member.setRole("安检员");
+                member.setScore(metric.getTotalScore());
+                members.add(member);
+            }
+        }
+
+        // 按个人总分降序排序
+        members.sort((a, b) -> b.getScore().compareTo(a.getScore()));
+
+        return members;
+    }
+
+
+    /**
+     * 转换为人员导出 DTO 列表
+     */
+    private List<PerformanceMetricsPersonalExportDto> convertToPersonalExportList(List<PerformanceMetricsResultDto> dataList, Date startTime, Date endTime) {
+        return dataList.stream()
+                .map(item -> {
+                    PerformanceMetricsPersonalExportDto dto = new PerformanceMetricsPersonalExportDto();
+                    dto.setName(item.getName());
+                    dto.setClassName(item.getClassName());
+                    dto.setDeptName(item.getDeptName());
+                    dto.setBrigadeName(item.getBrigadeName());
+                    dto.setSeizureEfficiency(item.getSeizureEfficiency());
+                    dto.setInspectionPassRate(item.getInspectionPassRate());
+                    dto.setTrainingScore(item.getTrainingScore());
+                    dto.setTotalScore(item.getTotalScore());
+                    dto.setStartTime(DateUtil.format(startTime, "yyyy-MM-dd"));
+                    dto.setEndTime(DateUtil.format(endTime, "yyyy-MM-dd"));
+                    return dto;
+                })
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 转换为班组导出 DTO 列表
+     */
+    private List<PerformanceMetricsTeamExportDto> convertToTeamExportList(List<PerformanceMetricsResultDto> dataList, Date startTime, Date endTime) {
+        return dataList.stream()
+                .map(item -> {
+                    PerformanceMetricsTeamExportDto dto = new PerformanceMetricsTeamExportDto();
+                    dto.setName(item.getName());
+                    dto.setDeptName(item.getDeptName());
+                    dto.setBrigadeName(item.getBrigadeName());
+                    dto.setSeizureEfficiency(item.getSeizureEfficiency());
+                    dto.setInspectionPassRate(item.getInspectionPassRate());
+                    dto.setTrainingScore(item.getTrainingScore());
+                    dto.setTotalScore(item.getTotalScore());
+                    dto.setStartTime(DateUtil.format(startTime, "yyyy-MM-dd"));
+                    dto.setEndTime(DateUtil.format(endTime, "yyyy-MM-dd"));
+                    return dto;
+                })
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 转换为科室导出 DTO 列表
+     */
+    private List<PerformanceMetricsDeptExportDto> convertToDeptExportList(List<PerformanceMetricsResultDto> dataList, Date startTime, Date endTime) {
+        return dataList.stream()
+                .map(item -> {
+                    PerformanceMetricsDeptExportDto dto = new PerformanceMetricsDeptExportDto();
+                    dto.setName(item.getName());
+                    dto.setBrigadeName(item.getBrigadeName());
+                    dto.setSeizureEfficiency(item.getSeizureEfficiency());
+                    dto.setInspectionPassRate(item.getInspectionPassRate());
+                    dto.setTrainingScore(item.getTrainingScore());
+                    dto.setTotalScore(item.getTotalScore());
+                    dto.setStartTime(DateUtil.format(startTime, "yyyy-MM-dd"));
+                    dto.setEndTime(DateUtil.format(endTime, "yyyy-MM-dd"));
+                    return dto;
+                })
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 转换为大队导出 DTO 列表
+     */
+    private List<PerformanceMetricsBrigadeExportDto> convertToBrigadeExportList(List<PerformanceMetricsResultDto> dataList, Date startTime, Date endTime) {
+        return dataList.stream()
+                .map(item -> {
+                    PerformanceMetricsBrigadeExportDto dto = new PerformanceMetricsBrigadeExportDto();
+                    dto.setName(item.getName());
+                    dto.setSeizureEfficiency(item.getSeizureEfficiency());
+                    dto.setInspectionPassRate(item.getInspectionPassRate());
+                    dto.setTrainingScore(item.getTrainingScore());
+                    dto.setTotalScore(item.getTotalScore());
+                    dto.setStartTime(DateUtil.format(startTime, "yyyy-MM-dd"));
+                    dto.setEndTime(DateUtil.format(endTime, "yyyy-MM-dd"));
+                    return dto;
+                })
+                .collect(Collectors.toList());
+    }
+
+
+    /**
+     * 保存配置到 sys_config 表
+     */
+    private void saveConfig(String configKey, String configName, String configValue) {
+        try {
+            SysConfig queryConfig = new SysConfig();
+            queryConfig.setConfigKey(configKey);
+            List<SysConfig> configList = configService.selectConfigList(queryConfig);
+            if (CollectionUtil.isNotEmpty(configList)) {
+                SysConfig config = configList.get(0);
+                config.setConfigValue(configValue);
+                configService.updateConfig(config);
+            } else {
+                // 新增配置
+                SysConfig config = new SysConfig();
+                config.setConfigName(configName);
+                config.setConfigKey(configKey);
+                config.setConfigValue(configValue);
+                config.setConfigType("N"); // 非系统内置
+                configService.insertConfig(config);
+            }
+        } catch (Exception e) {
+            log.error("保存配置失败：{}", e.getMessage());
+            throw e;
+        }
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/item/PerformanceMetricsController.java

@@ -0,0 +1,940 @@
+package com.sundot.airport.web.controller.item;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.sundot.airport.check.domain.CheckEfficiencyDto;
+import com.sundot.airport.check.domain.CheckEfficiencyRankDto;
+import com.sundot.airport.check.service.ICheckEfficiencyService;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.GroupedBoxPlotDataDto;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.dto.PerformanceMetricsParamDto;
+import com.sundot.airport.common.dto.PerformanceMetricsResultDto;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.DeptUtils;
+import com.sundot.airport.common.utils.GeometricMeanUtils;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.exam.service.IAccuracyStatisticsService;
+import com.sundot.airport.item.domain.SeizureEfficiencyDto;
+import com.sundot.airport.item.domain.SeizureEfficiencyRankDto;
+import com.sundot.airport.item.domain.dto.ConcealmentPositionTop1DTO;
+import com.sundot.airport.item.domain.dto.ProhibitedItemsTop3DTO;
+import com.sundot.airport.item.mapper.ItemLargeScreenMapper;
+import com.sundot.airport.item.service.SeizureDistributionService;
+import com.sundot.airport.item.service.SeizureEfficiencyService;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+import com.sundot.airport.system.mapper.SysUserMapper;
+import com.sundot.airport.system.service.ISysDeptService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.sundot.airport.common.core.domain.AjaxResult.success;
+import static com.sundot.airport.common.utils.SecurityUtils.getDeptId;
+
+/**
+ * 绩效指标Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-25
+ */
+@Slf4j
+@RestController
+@RequestMapping("/item/performance")
+public class PerformanceMetricsController {
+
+
+    @Autowired
+    private SeizureEfficiencyService seizureEfficiencyService;
+
+    @Autowired
+    private ICheckEfficiencyService checkEfficiencyService;
+
+
+    @Autowired
+    private SeizureDistributionService seizureDistributionService;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Autowired
+    private SysDeptMapper deptMapper;
+
+    @Autowired
+    private IAccuracyStatisticsService accuracyStatisticsService;
+
+    @Autowired
+    private ItemLargeScreenMapper itemLargeScreenMapper;
+
+    /**
+     * 查询查获效率统计
+     */
+    @GetMapping("/list")
+    public AjaxResult list(BaseLargeScreenQueryParamDto dto) {
+        SeizureEfficiencyDto result = seizureEfficiencyService.getSeizureEfficiency(dto, null);
+        return success(result);
+    }
+
+    /**
+     * 获取查获数量分布直方图数据
+     *
+     * @return 直方图数据列表，每个元素包含：组下限、组上限、该组内安检员人数
+     */
+    @GetMapping("/histogram")
+    public AjaxResult getSeizureHistogramData(BaseLargeScreenQueryParamDto dto) {
+        // 获取当前用户所在站点ID
+        Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+        if (topSiteId == null) {
+            return AjaxResult.error("无法找到有效的站点信息");
+        }
+        dto.setInspectStationId(topSiteId);
+        // 计算查获数量分布
+        List<SeizureDistributionService.SeizureHistogramData> result =
+                seizureDistributionService.calculateSeizureDistribution(dto);
+
+        return success(result);
+    }
+
+
+    /**
+     * 获取查获数量箱线图数据
+     *
+     * @return 箱线图数据，包含最小观察值、Q1、中位数、Q3、最大观察值、离群点等信息
+     */
+    @GetMapping("/boxplot")
+    public AjaxResult getSeizureBoxPlotData(BaseLargeScreenQueryParamDto dto) {
+        // 获取当前用户所在站点ID
+        Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+        if (topSiteId == null) {
+            return AjaxResult.error("无法找到有效的站点信息");
+        }
+        dto.setInspectStationId(topSiteId);
+        // 计算查获数量箱线图数据
+        List<GroupedBoxPlotDataDto> result = seizureDistributionService.calculateBoxPlotData(dto);
+
+        return success(result);
+    }
+
+    /**
+     * 查询全站查获违禁品 TOP3
+     *
+     * @param startDate 查询开始时间
+     *                  endDate 查询结束时间
+     * @return 违禁品 TOP3 数据，包含物品名称、查获数量、占比
+     */
+    @GetMapping("/prohibited-top3")
+    public AjaxResult getProhibitedItemsTop3(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
+                                             @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
+        try {
+            BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+            dto.setStartDate(startDate);
+            dto.setEndDate(endDate);
+            // 获取当前用户所在站点 ID
+            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+            if (topSiteId == null) {
+                return AjaxResult.error("无法找到有效的站点信息");
+            }
+            dto.setInspectStationId(topSiteId);
+
+            // 查询违禁品 TOP3
+            List<ProhibitedItemsTop3DTO> top3List = itemLargeScreenMapper.selectProhibitedItemsTop3(dto);
+
+            // 计算总数和占比
+            BigDecimal totalQuantity = itemLargeScreenMapper.getTotalSum(dto);
+            for (int i = 0; i < top3List.size(); i++) {
+                ProhibitedItemsTop3DTO item = top3List.get(i);
+                item.setRank(i + 1);
+
+                // 计算占比
+                if (totalQuantity.compareTo(BigDecimal.ZERO) > 0) {
+                    BigDecimal percentage = item.getQuantity()
+                            .multiply(new BigDecimal("100"))
+                            .divide(totalQuantity, 2, RoundingMode.HALF_UP);
+                    item.setPercentage(percentage);
+                } else {
+                    item.setPercentage(BigDecimal.ZERO);
+                }
+            }
+
+            return success(top3List);
+        } catch (Exception e) {
+            log.error("查询全站查获违禁品 TOP3 失败：{}", e.getMessage());
+            return AjaxResult.error("查询失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 查询隐匿重点部位 Top1
+     *
+     * @param startDate 查询开始时间
+     *                  endDate 查询结束时间
+     * @return 隐匿重点部位 Top1 数据
+     */
+    @GetMapping("/concealment-position-top1")
+    public AjaxResult getConcealmentPositionTop1(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
+                                                 @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
+        try {
+            BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+            dto.setStartDate(startDate);
+            dto.setEndDate(endDate);
+            // 获取当前用户所在站点 ID
+            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+            if (topSiteId == null) {
+                return AjaxResult.error("无法找到有效的站点信息");
+            }
+            dto.setInspectStationId(topSiteId);
+
+            // 查询隐匿重点部位 Top1
+            List<ConcealmentPositionTop1DTO> top1List = itemLargeScreenMapper.selectConcealmentPositionTop1(dto);
+
+            if (top1List == null || top1List.isEmpty()) {
+                return success(new ArrayList<>());
+            }
+
+            return success(top1List);
+        } catch (Exception e) {
+            log.error("查询隐匿重点部位 Top1 失败：{}", e.getMessage());
+            return AjaxResult.error("查询失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 绩效指标列表
+     *
+     * @param param 查询参数
+     * @return 组织/姓名、查获效率、巡检合格率、培训得分、总分
+     */
+    @PostMapping("/metrics")
+    public AjaxResult getPerformanceMetrics(@RequestBody PerformanceMetricsParamDto param) {
+        try {
+            // 参数校验和默认值设置
+            validateAndSetDefaults(param);
+
+            List<PerformanceMetricsResultDto> result = calculatePerformanceMetrics(param);
+
+            // 填充科室和班级信息
+            enrichDeptAndClassInfo(result, param);
+
+            sortAndRank(result, param);
+
+            return success(result);
+        } catch (Exception e) {
+            return AjaxResult.error("获取绩效指标失败: " + e.getMessage());
+        }
+    }
+
+
+    /**
+     * 填充科室和班级信息
+     */
+    private void enrichDeptAndClassInfo(List<PerformanceMetricsResultDto> result, PerformanceMetricsParamDto param) {
+        // 只处理人员维度和班组维度和科室维度
+        if (param.getDimension() == null || param.getDimension() == 4) {
+            return;
+        }
+
+
+        if (result == null || result.isEmpty()) {
+            return;
+        }
+
+        // 收集所有需要查询的 ID
+        Set<Long> ids = result.stream()
+                .map(PerformanceMetricsResultDto::getId)
+                .collect(Collectors.toSet());
+
+        // 预加载这些 ID 的信息
+        Map<Long, SysUser> userMap = new HashMap<>();
+        Map<Long, SysDept> deptMap = new HashMap<>();
+
+        if (param.getDimension() == 1) {
+            // 人员维度：加载用户和部门信息
+            for (Long id : ids) {
+                SysUser user = userMapper.selectUserById(id);
+                if (user != null) {
+                    userMap.put(id, user);
+                }
+            }
+            // 加载所有部门信息用于查找班组
+            List<SysDept> allDepts = sysDeptService.selectChildrenDeptById(DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId())));
+            for (SysDept dept : allDepts) {
+                deptMap.put(dept.getDeptId(), dept);
+            }
+        } else if (param.getDimension() == 2 || param.getDimension() == 3) {
+            // 班组维度：加载部门信息
+            List<SysDept> allDepts = sysDeptService.selectChildrenDeptById(DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId())));
+            for (SysDept dept : allDepts) {
+                deptMap.put(dept.getDeptId(), dept);
+            }
+        }
+
+        // 为所有时间点的数据填充科室和班级信息
+        for (PerformanceMetricsResultDto item : result) {
+            if (param.getDimension() == 1) {
+                // 人员维度
+                SysUser user = userMap.get(item.getId());
+                if (user != null) {
+                    Long deptId = user.getDeptId();
+                    if (deptId != null) {
+                        SysDept dept = deptMap.get(deptId);
+                        if (dept != null) {
+                            item.setClassName(dept.getDeptName());
+                            if (dept.getParentId() != null) {
+                                SysDept parentDept = deptMap.get(dept.getParentId());
+                                if (parentDept != null) {
+                                    item.setDeptName(parentDept.getDeptName());
+                                    if (parentDept.getParentId() != null) {
+                                        SysDept brigadeDept = deptMap.get(parentDept.getParentId());
+                                        if (brigadeDept != null) {
+                                            item.setBrigadeName(brigadeDept.getDeptName());
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } else if (param.getDimension() == 2) {
+                // 班组维度
+                SysDept dept = deptMap.get(item.getId());
+                if (dept != null) {
+                    if (dept.getParentId() != null) {
+                        SysDept parentDept = deptMap.get(dept.getParentId());
+                        if (parentDept != null) {
+                            item.setDeptName(parentDept.getDeptName());
+                            if (parentDept.getParentId() != null) {
+                                SysDept brigadeDept = deptMap.get(parentDept.getParentId());
+                                if (brigadeDept != null) {
+                                    item.setBrigadeName(brigadeDept.getDeptName());
+                                }
+                            }
+                        }
+                    }
+                }
+            } else if (param.getDimension() == 3) {
+                // 科室维度
+                SysDept dept = deptMap.get(item.getId());
+                if (dept != null) {
+                    if (dept.getParentId() != null) {
+                        SysDept parentDept = deptMap.get(dept.getParentId());
+                        if (parentDept != null) {
+                            item.setBrigadeName(parentDept.getDeptName());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 参数校验和设置默认值
+     */
+    private void validateAndSetDefaults(PerformanceMetricsParamDto param) {
+        if (param.getDimension() == null) {
+            param.setDimension(1); // 默认个人维度
+        }
+        if (param.getSortOrder() == null) {
+            param.setSortOrder(2); // 默认降序
+        }
+    }
+
+    /**
+     * 计算绩效指标
+     */
+    private List<PerformanceMetricsResultDto> calculatePerformanceMetrics(PerformanceMetricsParamDto param) {
+        List<PerformanceMetricsResultDto> result = new ArrayList<>();
+
+        if (param.getDimension() == 1) {
+            // 个人维度
+            result = calculatePersonalMetrics(param);
+        } else if (param.getDimension() == 2) {
+            // 班组维度
+            result = calculateTeamMetrics(param);
+        } else if (param.getDimension() == 3) {
+            // 科室维度
+            result = calculateDepartmentMetrics(param);
+        } else if (param.getDimension() == 4) {
+            // 大队维度
+            result = calculateBrigadeMetrics(param);
+        }
+
+        return result;
+    }
+
+    /**
+     * 计算查获效率
+     *
+     * @param param
+     * @return
+     */
+    private List<SeizureEfficiencyRankDto> calculateSeizureEfficiency(PerformanceMetricsParamDto param) {
+        List<SeizureEfficiencyRankDto> rankList = new ArrayList<>();
+
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        dto.setStartDate(param.getStartTime());
+        dto.setEndDate(param.getEndTime());
+        SeizureEfficiencyDto result = seizureEfficiencyService.getSeizureEfficiency(dto, param.getDimension());
+        if (param.getDimension() == 1) {
+            // 个人维度
+            rankList = result.getIndividualRankList();
+        } else if (param.getDimension() == 2) {
+            // 班组维度
+            rankList = result.getTeamRankList();
+        } else if (param.getDimension() == 3) {
+            // 科室维度
+            rankList = result.getDepartmentRankList();
+        } else if (param.getDimension() == 4) {
+            // 大队维度
+            rankList = result.getBrigadeRankList();
+        }
+        return rankList;
+    }
+
+
+    /**
+     * 计算个人绩效指标
+     */
+    private List<PerformanceMetricsResultDto> calculatePersonalMetrics(PerformanceMetricsParamDto param) {
+        List<PerformanceMetricsResultDto> result = new ArrayList<>();
+
+        // 获取当前用户所在站点ID
+        Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+        if (topSiteId == null) {
+            throw new ServiceException("无法找到有效的站点信息");
+        }
+
+        // 根据大队 ID 筛选
+        if (param.getBrigadeId() != null) {
+            topSiteId = param.getBrigadeId();
+        }
+
+        // 根据科室 ID 筛选
+        if (param.getDeptId() != null) {
+            topSiteId = param.getDeptId();
+        }
+
+        // 根据班组 ID 筛选
+        if (param.getTeamId() != null) {
+            topSiteId = param.getTeamId();
+        }
+
+        List<SysUser> sysUserTempList = userMapper.selectUserByDeptId(topSiteId);
+        List<SysUser> users = sysUserTempList.stream()
+                .filter(item -> item.getRoles().stream()
+                        .anyMatch(sysRole -> RoleTypeEnum.banzuzhang.getCode().equals(sysRole.getRoleKey())
+                                || RoleTypeEnum.SecurityCheck.getCode().equals(sysRole.getRoleKey())))
+                .collect(Collectors.toList());
+
+        if (users.isEmpty()) return result;
+
+        // 根据姓名模糊筛选
+        if (StringUtils.isNotEmpty(param.getUserName())) {
+            users = users.stream()
+                    .filter(user -> user.getNickName() != null
+                            && user.getNickName().contains(param.getUserName()))
+                    .collect(Collectors.toList());
+        }
+
+        if (users.isEmpty()) return result;
+
+        //查获效率
+        List<SeizureEfficiencyRankDto> rankList = calculateSeizureEfficiency(param);
+        //巡检合格率
+        List<CheckEfficiencyRankDto> checkRankList = calculateCheckEfficiency(param);
+
+        // 批量查询抽问抽答正确率
+        List<Long> userIds = users.stream().map(SysUser::getUserId).collect(Collectors.toList());
+        String startDate = formatDate(param.getStartTime());
+        String endDate = formatDate(param.getEndTime());
+        Map<Long, BigDecimal> accuracyMap = accuracyStatisticsService.getUsersAccuracyMap(userIds, startDate, endDate);
+
+        // 批量查询指标数据
+        List<MetricData> metricDataList = new ArrayList<>();
+        for (SysUser user : users) {
+            try {
+                MetricData data = new MetricData();
+                data.id = user.getUserId();
+                data.name = user.getNickName();
+                data.seizureEfficiency = queryPersonalSeizureEfficiency(user.getUserId(), rankList);
+                data.inspectionPassRate = queryPersonalInspectionRate(user.getUserId(), checkRankList);
+                data.trainingScore = queryPersonalTrainingScore(user.getUserId(), accuracyMap);
+                metricDataList.add(data);
+            } catch (Exception e) {
+                log.error("查询用户{}指标失败：{}", user.getUserName(), e.getMessage());
+            }
+        }
+
+        // 集体处理
+        return normalizeAndCreateResult(metricDataList);
+    }
+
+    /**
+     * 计算班组绩效指标
+     */
+    private List<PerformanceMetricsResultDto> calculateTeamMetrics(PerformanceMetricsParamDto param) {
+        List<PerformanceMetricsResultDto> result = new ArrayList<>();
+        // 查询所有班组
+        Long topSiteId = DeptUtils.getTopSiteId(deptMapper.selectDeptById(getDeptId()));
+
+        // 根据大队 ID 筛选
+        if (param.getBrigadeId() != null) {
+            topSiteId = param.getBrigadeId();
+        }
+
+        // 根据科室 ID 筛选
+        if (param.getDeptId() != null) {
+            topSiteId = param.getDeptId();
+        }
+
+        List<SysDept> teams = sysDeptService.selectChildrenDeptById(topSiteId).stream()
+                .filter(dept -> DeptTypeEnum.TEAMS.getCode().equals(dept.getDeptType()))
+                .collect(Collectors.toList());
+
+        // 根据班组 ID 筛选
+        if (param.getTeamId() != null && CollectionUtil.isNotEmpty(teams)) {
+            teams = teams.stream()
+                    .filter(item -> param.getTeamId().equals(item.getDeptId()))
+                    .collect(Collectors.toList());
+        }
+
+        if (teams.isEmpty()) return result;
+
+        //查获效率
+        List<SeizureEfficiencyRankDto> rankList = calculateSeizureEfficiency(param);
+        //巡检合格率
+        List<CheckEfficiencyRankDto> checkRankList = calculateCheckEfficiency(param);
+
+        // 批量查询抽问抽答正确率
+        List<Long> teamIds = teams.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+        String startDate = formatDate(param.getStartTime());
+        String endDate = formatDate(param.getEndTime());
+        Map<Long, BigDecimal> accuracyMap = accuracyStatisticsService.getTeamsAccuracyMap(teamIds, startDate, endDate);
+
+        // 批量查询指标数据
+        List<MetricData> metricDataList = new ArrayList<>();
+        for (SysDept team : teams) {
+            try {
+                MetricData data = new MetricData();
+                data.id = team.getDeptId();
+                data.name = team.getDeptName();
+                data.seizureEfficiency = queryTeamSeizureEfficiency(team.getDeptId(), rankList);
+                data.inspectionPassRate = queryTeamInspectionRate(team.getDeptId(), checkRankList);
+                data.trainingScore = queryTeamTrainingScore(team.getDeptId(), accuracyMap);
+                metricDataList.add(data);
+            } catch (Exception e) {
+                log.error("查询班组{}指标失败：{}", team.getDeptName(), e.getMessage());
+            }
+        }
+
+        // 集体处理
+        return normalizeAndCreateResult(metricDataList);
+    }
+
+    /**
+     * 计算科室绩效指标
+     */
+    private List<PerformanceMetricsResultDto> calculateDepartmentMetrics(PerformanceMetricsParamDto param) {
+        List<PerformanceMetricsResultDto> result = new ArrayList<>();
+
+        // 查询所有科室
+        Long topSiteId = DeptUtils.getTopSiteId(deptMapper.selectDeptById(getDeptId()));
+
+        // 根据大队 ID 筛选
+        if (param.getBrigadeId() != null) {
+            topSiteId = param.getBrigadeId();
+        }
+
+        List<SysDept> departments = sysDeptService.selectChildrenDeptById(topSiteId).stream()
+                .filter(dept -> DeptTypeEnum.MANAGER.getCode().equals(dept.getDeptType()))
+                .collect(Collectors.toList());
+
+        // 根据科室 ID 筛选
+        if (param.getDeptId() != null && CollectionUtil.isNotEmpty(departments)) {
+            departments = departments.stream()
+                    .filter(item -> param.getDeptId().equals(item.getDeptId()))
+                    .collect(Collectors.toList());
+        }
+
+        if (departments.isEmpty()) return result;
+
+        //查获效率
+        List<SeizureEfficiencyRankDto> rankList = calculateSeizureEfficiency(param);
+        //巡检合格率
+        List<CheckEfficiencyRankDto> checkRankList = calculateCheckEfficiency(param);
+
+        // 批量查询抽问抽答正确率
+        List<Long> deptIds = departments.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+        String startDate = formatDate(param.getStartTime());
+        String endDate = formatDate(param.getEndTime());
+        Map<Long, BigDecimal> accuracyMap = accuracyStatisticsService.getDeptsAccuracyMap(deptIds, startDate, endDate);
+
+        // 批量查询指标数据
+        List<MetricData> metricDataList = new ArrayList<>();
+        for (SysDept dept : departments) {
+            try {
+                MetricData data = new MetricData();
+                data.id = dept.getDeptId();
+                data.name = dept.getDeptName();
+                data.seizureEfficiency = queryDepartmentSeizureEfficiency(dept.getDeptId(), rankList);
+                data.inspectionPassRate = queryDepartmentInspectionRate(dept.getDeptId(), checkRankList);
+                data.trainingScore = queryDepartmentTrainingScore(dept.getDeptId(), accuracyMap);
+                metricDataList.add(data);
+            } catch (Exception e) {
+                log.error("查询科室{}指标失败：{}", dept.getDeptName(), e.getMessage());
+            }
+        }
+
+        // 集体处理
+        return normalizeAndCreateResult(metricDataList);
+    }
+
+    /**
+     * 计算大队绩效指标
+     */
+    private List<PerformanceMetricsResultDto> calculateBrigadeMetrics(PerformanceMetricsParamDto param) {
+        List<PerformanceMetricsResultDto> result = new ArrayList<>();
+
+        // 查询所有科室
+        Long topSiteId = DeptUtils.getTopSiteId(deptMapper.selectDeptById(getDeptId()));
+        List<SysDept> brigades = sysDeptService.selectChildrenDeptById(topSiteId).stream()
+                .filter(dept -> DeptTypeEnum.BRIGADE.getCode().equals(dept.getDeptType()))
+                .collect(Collectors.toList());
+
+        // 根据大队 ID 筛选
+        if (param.getBrigadeId() != null && CollectionUtil.isNotEmpty(brigades)) {
+            brigades = brigades.stream()
+                    .filter(item -> param.getBrigadeId().equals(item.getDeptId()))
+                    .collect(Collectors.toList());
+        }
+
+        if (brigades.isEmpty()) return result;
+
+        //查获效率
+        List<SeizureEfficiencyRankDto> rankList = calculateSeizureEfficiency(param);
+        //巡检合格率
+        List<CheckEfficiencyRankDto> checkRankList = calculateCheckEfficiency(param);
+
+        // 批量查询抽问抽答正确率
+        List<Long> deptIds = brigades.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+        String startDate = formatDate(param.getStartTime());
+        String endDate = formatDate(param.getEndTime());
+        Map<Long, BigDecimal> accuracyMap = accuracyStatisticsService.getDeptsAccuracyMap(deptIds, startDate, endDate);
+
+        // 批量查询指标数据
+        List<MetricData> metricDataList = new ArrayList<>();
+        for (SysDept dept : brigades) {
+            try {
+                MetricData data = new MetricData();
+                data.id = dept.getDeptId();
+                data.name = dept.getDeptName();
+                data.seizureEfficiency = queryDepartmentSeizureEfficiency(dept.getDeptId(), rankList);
+                data.inspectionPassRate = queryDepartmentInspectionRate(dept.getDeptId(), checkRankList);
+                data.trainingScore = queryDepartmentTrainingScore(dept.getDeptId(), accuracyMap);
+                metricDataList.add(data);
+            } catch (Exception e) {
+                log.error("查询科室{}指标失败：{}", dept.getDeptName(), e.getMessage());
+            }
+        }
+
+        // 集体处理
+        return normalizeAndCreateResult(metricDataList);
+    }
+
+    /**
+     * 集体处理
+     */
+    private List<PerformanceMetricsResultDto> normalizeAndCreateResult(List<MetricData> dataList) {
+        List<PerformanceMetricsResultDto> result = new ArrayList<>();
+
+        if (dataList.isEmpty()) return result;
+
+        // 标准化各项指标
+        List<NormalizedData> normalizedList = new ArrayList<>();
+        for (MetricData data : dataList) {
+            NormalizedData normalized = new NormalizedData();
+            normalized.id = data.id;
+            normalized.name = data.name;
+            normalized.seizureEfficiency = data.seizureEfficiency.multiply(new BigDecimal(100));
+            normalized.inspectionPassRate = data.inspectionPassRate.multiply(new BigDecimal(100));
+            normalized.trainingScore = data.trainingScore.multiply(new BigDecimal(100));
+            // 总分 = 查获效率 + 巡检合格率 + 抽问抽答正确率
+            normalized.totalScore = normalizeValue(data.seizureEfficiency, "w1")
+                    .add(normalizeValue(data.inspectionPassRate, "w2"))
+                    .add(normalizeValue(data.trainingScore, "w3"));
+            normalizedList.add(normalized);
+        }
+
+        // 转换为结果对象
+        for (NormalizedData data : normalizedList) {
+            PerformanceMetricsResultDto dto = new PerformanceMetricsResultDto();
+            dto.setId(data.id);
+            dto.setName(data.name);
+            dto.setSeizureEfficiency(data.seizureEfficiency);
+            dto.setInspectionPassRate(data.inspectionPassRate);
+            dto.setTrainingScore(data.trainingScore);
+            dto.setTotalScore(data.totalScore);
+            result.add(dto);
+        }
+
+        return result;
+    }
+
+    /**
+     * 标准化值处理
+     */
+    private BigDecimal normalizeValue(BigDecimal value, String w) {
+        BigDecimal bigDecimal = value != null ? value : BigDecimal.ZERO;
+        GeometricMeanUtils.CalculationResult calculationResult = GeometricMeanUtils.calculateWithWeights();
+        double d = 0;
+        if ("w1".equals(w)) {
+            d = calculationResult.getW1();
+        }
+        if ("w2".equals(w)) {
+            d = calculationResult.getW2();
+        }
+        if ("w3".equals(w)) {
+            d = calculationResult.getW3();
+        }
+        return bigDecimal.multiply(new BigDecimal(d)).setScale(4, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+    }
+
+    /**
+     * 排序和设置排名
+     */
+    private void sortAndRank(List<PerformanceMetricsResultDto> result, PerformanceMetricsParamDto param) {
+        // 排序
+        String sortField = param.getSortField();
+        if (sortField == null) sortField = "totalScore";
+
+        Comparator<PerformanceMetricsResultDto> comparator;
+        switch (sortField) {
+            case "seizureEfficiency":
+                comparator = Comparator.comparing(PerformanceMetricsResultDto::getSeizureEfficiency,
+                        Comparator.nullsFirst(BigDecimal::compareTo));
+                break;
+            case "inspectionPassRate":
+                comparator = Comparator.comparing(PerformanceMetricsResultDto::getInspectionPassRate,
+                        Comparator.nullsFirst(BigDecimal::compareTo));
+                break;
+            case "trainingScore":
+                comparator = Comparator.comparing(PerformanceMetricsResultDto::getTrainingScore,
+                        Comparator.nullsFirst(BigDecimal::compareTo));
+                break;
+            default: // totalScore
+                comparator = Comparator.comparing(PerformanceMetricsResultDto::getTotalScore,
+                        Comparator.nullsFirst(BigDecimal::compareTo));
+                break;
+        }
+
+        if (Integer.valueOf(2).equals(param.getSortOrder())) {
+            comparator = comparator.reversed(); // 降序
+        }
+
+        result.sort(comparator);
+
+        // 设置排名
+        for (int i = 0; i < result.size(); i++) {
+            result.get(i).setRank(i + 1);
+        }
+    }
+
+    /**
+     * 实现个人查获效率查询
+     * 个人查获效率=（个人查获效率－个人最低查获效率）/（个人最高查获效率－个人最低查获效率）
+     */
+    private BigDecimal queryPersonalSeizureEfficiency(Long userId, List<SeizureEfficiencyRankDto> rankList) {
+        BigDecimal reduce = rankList.stream().filter(rank -> rank.getId().equals(userId)).map(rank -> rank.getEfficiency() == null ? BigDecimal.ZERO : rank.getEfficiency()).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal min = reduce.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : rankList.stream().map(rank -> rank.getEfficiency() == null ? BigDecimal.ZERO : rank.getEfficiency()).min(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal max = rankList.stream().map(rank -> rank.getEfficiency() == null ? BigDecimal.ZERO : rank.getEfficiency()).max(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal difference = max.subtract(min);
+        BigDecimal normalized = difference.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : reduce.subtract(min).divide(difference, 2, RoundingMode.HALF_UP);
+        normalized = new BigDecimal("0.8").add(new BigDecimal("0.2").multiply(normalized));
+        return normalized;
+    }
+
+    /**
+     * 实现个人巡检合格率查询
+     *
+     * @param userId
+     * @param rankList
+     * @return
+     */
+    private BigDecimal queryPersonalInspectionRate(Long userId, List<CheckEfficiencyRankDto> rankList) {
+        BigDecimal reduce = rankList.stream().filter(rank -> rank.getId().equals(userId)).map(rank -> rank.getPassRate() == null ? BigDecimal.ZERO : rank.getPassRate()).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal min = reduce.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : rankList.stream().map(rank -> rank.getPassRate() == null ? BigDecimal.ZERO : rank.getPassRate()).min(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal max = rankList.stream().map(rank -> rank.getPassRate() == null ? BigDecimal.ZERO : rank.getPassRate()).max(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal difference = max.subtract(min);
+        BigDecimal normalized = difference.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : reduce.subtract(min).divide(difference, 2, RoundingMode.HALF_UP);
+        normalized = new BigDecimal("0.8").add(new BigDecimal("0.2").multiply(normalized));
+        return normalized;
+    }
+
+    /**
+     * 实现个人抽问抽答正确率查询
+     * 归一化公式：(当前值 - min) / (max - min)
+     */
+    private BigDecimal queryPersonalTrainingScore(Long userId, Map<Long, BigDecimal> accuracyMap) {
+        return new BigDecimal("0.8").add(new BigDecimal("0.2").multiply(normalizeFromMap(userId, accuracyMap)));
+    }
+
+    /**
+     * 实现班组查获效率查询
+     * 组织查获效率=（组织查获效率－组织最低查获效率）/（组织最高查获效率－组织最低查获效率）
+     */
+    private BigDecimal queryTeamSeizureEfficiency(Long teamId, List<SeizureEfficiencyRankDto> rankList) {
+        BigDecimal reduce = rankList.stream().filter(rank -> rank.getId().equals(teamId)).map(rank -> rank.getEfficiency() == null ? BigDecimal.ZERO : rank.getEfficiency()).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal min = reduce.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : rankList.stream().map(rank -> rank.getEfficiency() == null ? BigDecimal.ZERO : rank.getEfficiency()).min(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal max = rankList.stream().map(rank -> rank.getEfficiency() == null ? BigDecimal.ZERO : rank.getEfficiency()).max(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal difference = max.subtract(min);
+        BigDecimal normalized = difference.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : reduce.subtract(min).divide(difference, 2, RoundingMode.HALF_UP);
+        normalized = new BigDecimal("0.8").add(new BigDecimal("0.2").multiply(normalized));
+        return normalized;
+    }
+
+    /**
+     * 实现班组巡检合格率查询
+     */
+    private BigDecimal queryTeamInspectionRate(Long teamId, List<CheckEfficiencyRankDto> rankList) {
+        BigDecimal reduce = rankList.stream().filter(rank -> rank.getId().equals(teamId)).map(rank -> rank.getPassRate() == null ? BigDecimal.ZERO : rank.getPassRate()).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal min = reduce.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : rankList.stream().map(rank -> rank.getPassRate() == null ? BigDecimal.ZERO : rank.getPassRate()).min(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal max = rankList.stream().map(rank -> rank.getPassRate() == null ? BigDecimal.ZERO : rank.getPassRate()).max(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal difference = max.subtract(min);
+        BigDecimal normalized = difference.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : reduce.subtract(min).divide(difference, 2, RoundingMode.HALF_UP);
+        normalized = new BigDecimal("0.8").add(new BigDecimal("0.2").multiply(normalized));
+        return normalized;
+    }
+
+    /**
+     * 实现班组抽问抽答正确率查询
+     * 归一化公式：(当前值 - min) / (max - min)
+     */
+    private BigDecimal queryTeamTrainingScore(Long teamId, Map<Long, BigDecimal> accuracyMap) {
+        return new BigDecimal("0.8").add(new BigDecimal("0.2").multiply(normalizeFromMap(teamId, accuracyMap)));
+    }
+
+    /**
+     * 实现科室查获效率查询
+     * 组织查获效率=（组织查获效率－组织最低查获效率）/（组织最高查获效率－组织最低查获效率）
+     */
+    private BigDecimal queryDepartmentSeizureEfficiency(Long deptId, List<SeizureEfficiencyRankDto> rankList) {
+        BigDecimal reduce = rankList.stream().filter(rank -> rank.getId().equals(deptId)).map(rank -> rank.getEfficiency() == null ? BigDecimal.ZERO : rank.getEfficiency()).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal min = reduce.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : rankList.stream().map(rank -> rank.getEfficiency() == null ? BigDecimal.ZERO : rank.getEfficiency()).min(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal max = rankList.stream().map(rank -> rank.getEfficiency() == null ? BigDecimal.ZERO : rank.getEfficiency()).max(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal difference = max.subtract(min);
+        BigDecimal normalized = difference.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : reduce.subtract(min).divide(difference, 2, RoundingMode.HALF_UP);
+        normalized = new BigDecimal("0.8").add(new BigDecimal("0.2").multiply(normalized));
+        return normalized;
+    }
+
+    /**
+     * 实现科室巡检合格率查询
+     */
+    private BigDecimal queryDepartmentInspectionRate(Long deptId, List<CheckEfficiencyRankDto> rankList) {
+        BigDecimal reduce = rankList.stream().filter(rank -> rank.getId().equals(deptId)).map(rank -> rank.getPassRate() == null ? BigDecimal.ZERO : rank.getPassRate()).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal min = reduce.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : rankList.stream().map(rank -> rank.getPassRate() == null ? BigDecimal.ZERO : rank.getPassRate()).min(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal max = rankList.stream().map(rank -> rank.getPassRate() == null ? BigDecimal.ZERO : rank.getPassRate()).max(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal difference = max.subtract(min);
+        BigDecimal normalized = difference.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : reduce.subtract(min).divide(difference, 2, RoundingMode.HALF_UP);
+        normalized = new BigDecimal("0.8").add(new BigDecimal("0.2").multiply(normalized));
+        return normalized;
+    }
+
+    /**
+     * 实现科室抽问抽答正确率查询
+     * 归一化公式：(当前值 - min) / (max - min)
+     */
+    private BigDecimal queryDepartmentTrainingScore(Long deptId, Map<Long, BigDecimal> accuracyMap) {
+        return new BigDecimal("0.8").add(new BigDecimal("0.2").multiply(normalizeFromMap(deptId, accuracyMap)));
+    }
+
+    /**
+     * 从正确率Map中归一化指定ID的值
+     * 归一化公式：(当前值 - min) / (max - min)，与查获效率的归一化逻辑一致
+     */
+    private BigDecimal normalizeFromMap(Long id, Map<Long, BigDecimal> accuracyMap) {
+        if (accuracyMap == null || accuracyMap.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+        BigDecimal value = accuracyMap.getOrDefault(id, BigDecimal.ZERO);
+        BigDecimal min = accuracyMap.values().stream().min(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal max = accuracyMap.values().stream().max(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+        BigDecimal difference = max.subtract(min);
+        return difference.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : value.subtract(min).divide(difference, 2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * Date转yyyy-MM-dd字符串
+     */
+    private String formatDate(Date date) {
+        if (date == null) {
+            return null;
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(date);
+    }
+
+    /**
+     * 指标数据内部类
+     */
+    private static class MetricData {
+        Long id;
+        String name;
+        BigDecimal seizureEfficiency;
+        BigDecimal inspectionPassRate;
+        BigDecimal trainingScore;
+    }
+
+    /**
+     * 标准化数据内部类
+     */
+    private static class NormalizedData {
+        Long id;
+        String name;
+        BigDecimal seizureEfficiency;
+        BigDecimal inspectionPassRate;
+        BigDecimal trainingScore;
+        BigDecimal totalScore;
+    }
+
+    /**
+     * 计算巡检合格率
+     *
+     * @param param
+     * @return
+     */
+    private List<CheckEfficiencyRankDto> calculateCheckEfficiency(PerformanceMetricsParamDto param) {
+        List<CheckEfficiencyRankDto> rankList = new ArrayList<>();
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        dto.setStartDate(param.getStartTime());
+        dto.setEndDate(param.getEndTime());
+        CheckEfficiencyDto result = checkEfficiencyService.getCheckEfficiency(dto, param.getDimension());
+        if (param.getDimension() == 1) {
+            // 个人维度
+            rankList = result.getIndividualRankList();
+        } else if (param.getDimension() == 2) {
+            // 班组维度
+            rankList = result.getTeamRankList();
+        } else if (param.getDimension() == 3) {
+            // 科室维度
+            rankList = result.getDepartmentRankList();
+        } else if (param.getDimension() == 3) {
+            // 大队维度
+            rankList = result.getBrigadeRankList();
+        }
+        return rankList;
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/item/SeizureMessagePushController.java

@@ -0,0 +1,73 @@
+package com.sundot.airport.web.controller.item;
+
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.item.domain.push.SeizureMessagePushDTO;
+import com.sundot.airport.item.service.ISeizureMessagePushService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * 查获消息推送 Controller
+ *
+ * @author wangxx
+ * @date 2026-03-31
+ */
+@Slf4j
+@RestController
+@RequestMapping("/item/seizure/push")
+@Api(tags = "查获消息推送")
+public class SeizureMessagePushController extends BaseController {
+
+    @Autowired
+    private ISeizureMessagePushService seizureMessagePushService;
+
+    /**
+     * 获取查获消息推送数据
+     *
+     * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
+     * @param endDate   结束日期（可选，格式：yyyy-MM-dd）
+     * @return 查获消息推送数据
+     */
+    @ApiOperation("获取查获消息推送数据")
+    @GetMapping("/message")
+    public AjaxResult getMessagePushData(@RequestParam(required = false) String startDate,
+                                         @RequestParam(required = false) String endDate) {
+        try {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            Long userId = loginUser.getUserId();
+            Long deptId = loginUser.getDeptId();
+
+            Date startDateTime;
+            Date endDateTime;
+
+            if (startDate == null || endDate == null) {
+                // 默认近 15 天（不包含今天）
+                endDateTime = DateUtils.addDays(new Date(), -1);
+                startDateTime = DateUtils.addDays(endDateTime, -14);
+            } else {
+                startDateTime = DateUtils.parseDate(startDate);
+                endDateTime = DateUtils.parseDate(endDate);
+            }
+
+            SeizureMessagePushDTO result = seizureMessagePushService.getSeizureMessagePushData(
+                    userId, deptId, startDateTime, endDateTime);
+
+            return AjaxResult.success(result);
+        } catch (Exception e) {
+            log.error("获取查获消息推送数据失败，error: ", e);
+            return AjaxResult.error("获取查获消息推送数据失败：" + e.getMessage());
+        }
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/monitor/CacheController.java

@@ -0,0 +1,115 @@
+package com.sundot.airport.web.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.constant.CacheConstants;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.system.domain.SysCache;
+
+/**
+ * 缓存监控
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/cache")
+public class CacheController {
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+    private final static List<SysCache> caches = new ArrayList<SysCache>();
+
+    {
+        caches.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "用户信息"));
+        caches.add(new SysCache(CacheConstants.SYS_CONFIG_KEY, "配置信息"));
+        caches.add(new SysCache(CacheConstants.SYS_DICT_KEY, "数据字典"));
+        caches.add(new SysCache(CacheConstants.CAPTCHA_CODE_KEY, "验证码"));
+        caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "防重提交"));
+        caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理"));
+        caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception {
+        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
+        Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
+        Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());
+
+        Map<String, Object> result = new HashMap<>(3);
+        result.put("info", info);
+        result.put("dbSize", dbSize);
+
+        List<Map<String, String>> pieList = new ArrayList<>();
+        commandStats.stringPropertyNames().forEach(key -> {
+            Map<String, String> data = new HashMap<>(2);
+            String property = commandStats.getProperty(key);
+            data.put("name", StringUtils.removeStart(key, "cmdstat_"));
+            data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
+            pieList.add(data);
+        });
+        result.put("commandStats", pieList);
+        return AjaxResult.success(result);
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping("/getNames")
+    public AjaxResult cache() {
+        return AjaxResult.success(caches);
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping("/getKeys/{cacheName}")
+    public AjaxResult getCacheKeys(@PathVariable String cacheName) {
+        Set<String> cacheKeys = redisTemplate.keys(cacheName + "*");
+        return AjaxResult.success(new TreeSet<>(cacheKeys));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping("/getValue/{cacheName}/{cacheKey}")
+    public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) {
+        String cacheValue = redisTemplate.opsForValue().get(cacheKey);
+        SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue);
+        return AjaxResult.success(sysCache);
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @DeleteMapping("/clearCacheName/{cacheName}")
+    public AjaxResult clearCacheName(@PathVariable String cacheName) {
+        Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
+        redisTemplate.delete(cacheKeys);
+        return AjaxResult.success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @DeleteMapping("/clearCacheKey/{cacheKey}")
+    public AjaxResult clearCacheKey(@PathVariable String cacheKey) {
+        redisTemplate.delete(cacheKey);
+        return AjaxResult.success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @DeleteMapping("/clearCacheAll")
+    public AjaxResult clearCacheAll() {
+        Collection<String> cacheKeys = redisTemplate.keys("*");
+        redisTemplate.delete(cacheKeys);
+        return AjaxResult.success();
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/monitor/ServerController.java

@@ -0,0 +1,25 @@
+package com.sundot.airport.web.controller.monitor;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.framework.web.domain.Server;
+
+/**
+ * 服务器监控
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/server")
+public class ServerController {
+    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception {
+        Server server = new Server();
+        server.copyTo();
+        return AjaxResult.success(server);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/monitor/SysLogininforController.java

@@ -0,0 +1,77 @@
+package com.sundot.airport.web.controller.monitor;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.framework.web.service.SysPasswordService;
+import com.sundot.airport.system.domain.SysLogininfor;
+import com.sundot.airport.system.service.ISysLogininforService;
+
+/**
+ * 系统访问记录
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/logininfor")
+public class SysLogininforController extends BaseController {
+    @Autowired
+    private ISysLogininforService logininforService;
+
+    @Autowired
+    private SysPasswordService passwordService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysLogininfor logininfor) {
+        startPage();
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        return getDataTable(list);
+    }
+
+    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysLogininfor logininfor) {
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
+        util.exportExcel(response, list, "登录日志");
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{infoIds}")
+    public AjaxResult remove(@PathVariable Long[] infoIds) {
+        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public AjaxResult clean() {
+        logininforService.cleanLogininfor();
+        return success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
+    @Log(title = "账户解锁", businessType = BusinessType.OTHER)
+    @GetMapping("/unlock/{userName}")
+    public AjaxResult unlock(@PathVariable("userName") String userName) {
+        passwordService.clearLoginRecordCache(userName);
+        return success();
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/monitor/SysOperlogController.java

@@ -0,0 +1,65 @@
+package com.sundot.airport.web.controller.monitor;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.system.domain.SysOperLog;
+import com.sundot.airport.system.service.ISysOperLogService;
+
+/**
+ * 操作日志记录
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/operlog")
+public class SysOperlogController extends BaseController {
+    @Autowired
+    private ISysOperLogService operLogService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysOperLog operLog) {
+        startPage();
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        return getDataTable(list);
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysOperLog operLog) {
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+        util.exportExcel(response, list, "操作日志");
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.DELETE)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/{operIds}")
+    public AjaxResult remove(@PathVariable Long[] operIds) {
+        return toAjax(operLogService.deleteOperLogByIds(operIds));
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/clean")
+    public AjaxResult clean() {
+        operLogService.cleanOperLog();
+        return success();
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/monitor/SysUserOnlineController.java

@@ -0,0 +1,73 @@
+package com.sundot.airport.web.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.constant.CacheConstants;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.core.redis.RedisCache;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.system.domain.SysUserOnline;
+import com.sundot.airport.system.service.ISysUserOnlineService;
+
+/**
+ * 在线用户监控
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/online")
+public class SysUserOnlineController extends BaseController {
+    @Autowired
+    private ISysUserOnlineService userOnlineService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(String ipaddr, String userName) {
+        Collection<String> keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
+        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+        for (String key : keys) {
+            LoginUser user = redisCache.getCacheObject(key);
+            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
+                userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+            } else if (StringUtils.isNotEmpty(ipaddr)) {
+                userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+            } else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) {
+                userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+            } else {
+                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+            }
+        }
+        Collections.reverse(userOnlineList);
+        userOnlineList.removeAll(Collections.singleton(null));
+        return getDataTable(userOnlineList);
+    }
+
+    /**
+     * 强退用户
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+    @DeleteMapping("/{tokenId}")
+    public AjaxResult forceLogout(@PathVariable String tokenId) {
+        redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
+        return success();
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/portrait/AttendanceStatsController.java

@@ -0,0 +1,209 @@
+package com.sundot.airport.web.controller.portrait;
+
+import com.sundot.airport.attendance.domain.AttendancePostRecord;
+import com.sundot.airport.attendance.portrait.StationWorkStatsService;
+import com.sundot.airport.attendance.service.IAttendancePostRecordService;
+import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
+import com.sundot.airport.common.domain.portrait.ModularIndicatorResult;
+import com.sundot.airport.common.enums.portrait.UserType;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.service.portrait.ModuleIndicatorManager;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.system.domain.vo.PositionInfoVO;
+import com.sundot.airport.system.service.IBasePositionService;
+import com.sundot.airport.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.spring.web.json.JacksonModuleRegistrar;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 考勤统计控制器
+ * 提供考勤指标计算的REST API接口
+ */
+@RestController
+@RequestMapping("/attendance/stats")
+public class AttendanceStatsController {
+
+    @Autowired
+    private ModuleIndicatorManager moduleIndicatorManager;
+
+    @Autowired
+    private StationWorkStatsService stationWorkStatsService;
+
+    @Autowired
+    private IAttendancePostRecordService attendancePostRecordService;
+
+    @Autowired
+    private IBasePositionService basePositionService;
+
+    @Autowired
+    private ISysConfigService configService;
+
+
+    /**
+     * 计算站级考勤工作统计
+     *
+     * @param params 指标计算参数
+     * @return 站级工作统计数据
+     */
+    @Cacheable(
+            value = "attendance_station",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/station")
+    public Object getStationWorkStats(IndicatorCalculateParams params) {
+        return stationWorkStatsService.calculateStationWorkStats(params);
+    }
+
+
+    /**
+     * 通道开放趋势图(折线图)
+     * 通道开放数、开放时长、通道开放平均线
+     */
+    @Cacheable(
+            value = "attendance_open_trend",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/channel/open/trend")
+    public Object getChannelOpenTrend(IndicatorCalculateParams params) {
+        // 处理默认时间范围（91天）
+        Date startDate = params.getStartTime();
+        Date endDate = params.getEndTime();
+
+        // 如果没有提供时间范围，默认为最近91天
+        if (startDate == null || endDate == null) {
+            endDate = new Date();
+            startDate = DateUtils.addDays(endDate, -90); // 91天包括今天
+        }
+
+        // 生成日期范围
+        List<String> dateRange = generateDateRange(startDate, endDate);
+        Map<String, Object> channelOpenTrend = new HashMap<>();
+        // 按日期分组处理数据
+        List<Map<String, Object>> trendData = new ArrayList<>();
+        try {
+            // 获取班次开始和结束时间
+//            String startTime = configService.selectConfigByKey("attendance.post.record.start.time");
+//            String endTime = configService.selectConfigByKey("attendance.post.record.end.time");
+//            Date shiftStartTime = DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startDate) + " " + startTime);
+//            Date shiftEndTime = DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(endDate, 1)) + " " + endTime);
+            String startTime = "00:00:00";
+            String endTime = "23:59:59";
+            Date shiftStartTime = DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startDate) + " " + startTime);
+            Date shiftEndTime = DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endDate) + " " + endTime);
+
+            // 一次性查询整个时间范围内的所有在岗记录
+            AttendancePostRecord queryPostRecord = new AttendancePostRecord();
+            queryPostRecord.setCheckInTimeStart(shiftStartTime);
+            queryPostRecord.setCheckInTimeEnd(shiftEndTime);
+            if (Objects.nonNull(params.getDeptId())) {
+                queryPostRecord.setAttendanceBrigadeId(params.getDeptId());
+            }
+            List<AttendancePostRecord> postRecords = attendancePostRecordService.selectAttendancePostRecordList(queryPostRecord);
+
+
+            for (String date : dateRange) {
+                Map<String, Object> dataPoint = new HashMap<>();
+                dataPoint.put("date", date);
+
+                // 过滤出当前日期的数据
+                List<AttendancePostRecord> currentDateRecords = filterRecordsByDate(postRecords, date);
+
+                // 统计开放通道数
+                long openChannelCount = currentDateRecords.stream()
+                        .map(AttendancePostRecord::getChannelCode)
+                        .filter(Objects::nonNull)
+                        .count();
+
+                // 计算总开放时长（分钟），直接使用数据库中的工作时长字段
+                long totalOpenDuration = currentDateRecords.stream()
+                        .filter(item -> StringUtils.isNotEmpty(item.getChannelCode()))
+                        .mapToLong(record -> {
+                            Long workDuration = record.getWorkDuration();
+                            // 如果工作时长为null或小于等于0，则返回0
+                            return workDuration != null && workDuration > 0 ? workDuration : 0;
+                        })
+                        .sum();
+
+
+                //开放通道
+                dataPoint.put("openCount", openChannelCount);
+                //开放时长(小时)
+                dataPoint.put("openDuration", totalOpenDuration == 0 ? 0 : new BigDecimal(totalOpenDuration).divide(new BigDecimal(60), 2, RoundingMode.HALF_UP));
+                trendData.add(dataPoint);
+            }
+            BigDecimal divide = new BigDecimal(postRecords.size()).divide(new BigDecimal(dateRange.size()), 1, RoundingMode.HALF_UP);
+            channelOpenTrend.put("avg", divide);
+            channelOpenTrend.put("trend", trendData);
+            return channelOpenTrend;
+        } catch (Exception e) {
+            throw new ServiceException("通道开放趋势计算错误: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 根据日期过滤记录
+     *
+     * @param records    所有记录
+     * @param targetDate 目标日期
+     * @return 过滤后的记录列表
+     */
+    private List<AttendancePostRecord> filterRecordsByDate(List<AttendancePostRecord> records, String targetDate) {
+        return records.stream()
+                .filter(record -> {
+                    Date attendanceDate = record.getAttendanceDate();
+                    // 检查签到时间是否在目标日期
+                    return attendanceDate != null && DateUtils.parseDateToStr("yyyy-MM-dd", attendanceDate).equals(targetDate);
+                })
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取所有通道信息
+     *
+     * @return 所有通道列表
+     */
+    private List<PositionInfoVO> getAllChannels() {
+        // 这里传入空列表表示获取所有通道
+        return basePositionService.selectChannelsUnderArea(new ArrayList<>());
+    }
+
+    /**
+     * 生成日期范围列表
+     *
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return 日期范围列表
+     */
+    private List<String> generateDateRange(Date startDate, Date endDate) {
+        List<String> dateRange = new ArrayList<>();
+
+        // 将Date转换为LocalDate
+        LocalDate start = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        LocalDate end = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+
+        // 计算天数差
+        long daysBetween = ChronoUnit.DAYS.between(start, end);
+
+        // 生成日期范围（包括起始和结束日期）
+        for (int i = 0; i <= daysBetween; i++) {
+            LocalDate currentDate = start.plusDays(i);
+            dateRange.add(currentDate.toString());
+        }
+
+        return dateRange;
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/portrait/ItemUserRankingController.java

@@ -0,0 +1,309 @@
+package com.sundot.airport.web.controller.portrait;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.domain.portrait.ApprovalDurationStats;
+import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.enums.portrait.UserType;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.item.domain.ItemLargeScreenCommonDto;
+import com.sundot.airport.item.domain.ItemLargeScreenDailyTrendDto;
+import com.sundot.airport.item.domain.ItemLargeScreenTimeSpanDto;
+import com.sundot.airport.item.service.UserRankingService;
+import com.sundot.airport.system.domain.approval.ApprovalInstance;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+import com.sundot.airport.system.mapper.approval.ApprovalHistoryMapper;
+import com.sundot.airport.system.mapper.approval.ApprovalInstanceMapper;
+import com.sundot.airport.system.mapper.SysUserMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.PostConstruct;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/item/user-ranking")
+public class ItemUserRankingController {
+
+    @Autowired
+    private UserRankingService userRankingService;
+
+    @Autowired
+    private ApprovalInstanceMapper approvalInstanceMapper;
+
+    @Autowired
+    private ApprovalHistoryMapper approvalHistoryMapper;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    /**
+     * 获取用户在指定层级的详细排名信息
+     *
+     * @param dto   查询参数
+     * @param level 层级类型：station(全站), brigade(大队), department(科室), team(班组)
+     * @return 用户在该层级的详细排名信息
+     */
+    @Cacheable(
+            value = "item_ranking_detail",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @PreAuthorize("@ss.hasPermi('item:record:list')")
+    @GetMapping("/ranking-detail")
+    public AjaxResult getUserRankingByLevel(BaseLargeScreenQueryParamDto dto,
+                                            @RequestParam("level") String level) {
+        ItemLargeScreenCommonDto ranking = userRankingService.getUserRankingByLevel(dto, level);
+        return AjaxResult.success(ranking);
+    }
+
+
+    /**
+     * 计算站级查获统计
+     *
+     * @param params 参数
+     * @return 站级查获统计
+     */
+    @Cacheable(
+            value = "item_station",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/station")
+    public AjaxResult getStationItemSeizure(IndicatorCalculateParams params) {
+        return AjaxResult.success(userRankingService.calculateStationItemSeizure(params));
+    }
+
+    /**
+     * 查获审批时长统计
+     *
+     * @param params 查询参数
+     * @return 平均审批时长 最长审批时长 最短审批时长
+     */
+    @Cacheable(
+            value = "item_duration",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/seizure-approval/duration")
+    public AjaxResult getSeizureApprovalDurationStats(IndicatorCalculateParams params) {
+        // 设置默认时间范围
+        java.util.Date endTime = Optional.ofNullable(params.getEndTime()).orElse(new java.util.Date());
+        java.util.Date startTime = Optional.ofNullable(params.getStartTime())
+                .orElse(java.util.Date.from(endTime.toInstant().minusSeconds(7862400L))); // 91天
+
+        // 如果传了部门ID，则先查询该部门及其子部门下的所有用户ID
+        List<Long> userIds = null;
+        if (params.getDeptId() != null) {
+            List<SysUser> sysUserList = sysUserMapper.selectUserListByRoleKeyAndDeptId(
+                    Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()),
+                    params.getDeptId());
+            userIds = sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList());
+        }
+
+        // 查询workflow_id为4或5的审批实例（查获审批流程）
+        List<ApprovalInstance> instances = approvalInstanceMapper.selectApprovalInstancesByWorkflowIdsAndTimeRangeAndUsers(
+                Arrays.asList(7L),
+                startTime,
+                endTime,
+                userIds);
+
+        if (instances.isEmpty()) {
+            ApprovalDurationStats result = new ApprovalDurationStats();
+            result.setAverageDuration(0L);
+            result.setMaxDuration(0L);
+            result.setMinDuration(0L);
+            return AjaxResult.success(result);
+        }
+
+        // 计算每个实例的审批时长（毫秒）
+        List<Long> durations = instances.stream()
+                .map(instance -> {
+                    Date submitTime = instance.getSubmitTime();
+                    Date completionTime = instance.getCompletionTime();
+                    if (submitTime != null && completionTime != null) {
+                        return completionTime.getTime() - submitTime.getTime();
+                    }
+                    return 0L;
+                })
+                .filter(duration -> duration > 0)
+                .collect(Collectors.toList());
+
+        if (durations.isEmpty()) {
+            ApprovalDurationStats result = new ApprovalDurationStats();
+            result.setAverageDuration(0L);
+            result.setMaxDuration(0L);
+            result.setMinDuration(0L);
+            return AjaxResult.success(result);
+        }
+
+        // 计算统计数据
+        long totalDuration = durations.stream().mapToLong(Long::longValue).sum();
+        long averageDuration = totalDuration / durations.size();
+        long maxDuration = durations.stream().mapToLong(Long::longValue).max().orElse(0L);
+        long minDuration = durations.stream().mapToLong(Long::longValue).min().orElse(0L);
+
+        ApprovalDurationStats result = new ApprovalDurationStats();
+        result.setAverageDuration(averageDuration);
+        result.setMaxDuration(maxDuration);
+        result.setMinDuration(minDuration);
+
+        // 转换为小时和分钟显示
+        result.setAverageDurationText(formatDuration(averageDuration));
+        result.setMaxDurationText(formatDuration(maxDuration));
+        result.setMinDurationText(formatDuration(minDuration));
+
+        return AjaxResult.success(result);
+    }
+
+    /**
+     * 格式化持续时间显示
+     *
+     * @param durationMillis 毫秒数
+     * @return 格式化后的字符串，如"1天2小时30分钟45秒"
+     */
+    private String formatDuration(long durationMillis) {
+        long seconds = durationMillis / 1000;
+        long minutes = seconds / 60;
+        long hours = minutes / 60;
+        long days = hours / 24;
+
+        seconds = seconds % 60;
+        minutes = minutes % 60;
+        hours = hours % 24;
+
+        StringBuilder sb = new StringBuilder();
+        if (days > 0) {
+            sb.append(days).append("天");
+        }
+        if (hours > 0) {
+            sb.append(hours).append("小时");
+        }
+        if (minutes > 0) {
+            sb.append(minutes).append("分钟");
+        }
+        if (seconds > 0 || sb.length() == 0) {
+            sb.append(seconds).append("秒");
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 查获趋势图，获取有效查获趋势数据（默认近90天）
+     *
+     * @param params 查询参数(科室就传部门id，站就可以不传参数)
+     * @return 查获趋势数据
+     */
+    @Cacheable(
+            value = "item_seizure_trend",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/seizure-trend")
+    public AjaxResult getSeizureTrendData(IndicatorCalculateParams params) {
+        try {
+            // 设置默认时间范围为近91天
+            Date endTime = Optional.ofNullable(params.getEndTime()).orElse(new Date());
+            Date startTime = Optional.ofNullable(params.getStartTime())
+                    .orElse(Date.from(endTime.toInstant().minusSeconds(TimeUnit.DAYS.toSeconds(91))));
+
+            // 参数校验
+            if (startTime.after(endTime)) {
+                return AjaxResult.error("开始时间不能晚于结束时间");
+            }
+
+            params.setStartTime(startTime);
+            params.setEndTime(endTime);
+
+            // 创建查询参数对象
+            BaseLargeScreenQueryParamDto queryDto = new BaseLargeScreenQueryParamDto();
+            queryDto.setStartDate(startTime);
+            queryDto.setEndDate(endTime);
+
+            // 如果传了部门ID，则设置到查询参数中
+            if (params.getDeptId() != null) {
+                SysDept sysDept = sysDeptMapper.selectDeptById(params.getDeptId());
+                if (sysDept != null) {
+                    if (DeptTypeEnum.BRIGADE.getCode().equals(sysDept.getDeptType())) {
+                        queryDto.setInspectBrigadeId(params.getDeptId());
+                    } else if (DeptTypeEnum.MANAGER.getCode().equals(sysDept.getDeptType())) {
+                        queryDto.setInspectDepartmentId(params.getDeptId());
+                    } else if (DeptTypeEnum.TEAMS.getCode().equals(sysDept.getDeptType())) {
+                        queryDto.setInspectTeamId(params.getDeptId());
+                    }
+                }
+            }
+
+            // 调用service获取按天统计的查获趋势数据,没有的补0
+            List<ItemLargeScreenDailyTrendDto> trendData = userRankingService.getDailyTrendData(queryDto);
+
+            List<Date> dateRange = generateDateRange(startTime, endTime);
+            // 创建一个Map来快速查找已有数据
+            Map<Date, ItemLargeScreenDailyTrendDto> trendDataMap = trendData.stream()
+                    .collect(Collectors.toMap(ItemLargeScreenDailyTrendDto::getDate, dto -> dto));
+
+            // 构建完整的趋势数据列表，缺失日期补0
+            List<ItemLargeScreenDailyTrendDto> completeTrendData = new ArrayList<>();
+            for (Date date : dateRange) {
+                if (trendDataMap.containsKey(date)) {
+                    completeTrendData.add(trendDataMap.get(date));
+                } else {
+                    // 创建一个新的对象并设置日期和默认值
+                    ItemLargeScreenDailyTrendDto emptyDto = new ItemLargeScreenDailyTrendDto();
+                    emptyDto.setDate(date);
+                    emptyDto.setTotal(BigDecimal.ZERO); // 假设没有查获记录时值为0
+                    completeTrendData.add(emptyDto);
+                }
+            }
+
+            return AjaxResult.success(completeTrendData);
+        } catch (Exception e) {
+            return AjaxResult.error("获取趋势数据失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 生成日期范围列表
+     *
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return 日期范围列表
+     */
+    private List<Date> generateDateRange(Date startDate, Date endDate) throws ParseException {
+        List<Date> dateRange = new ArrayList<>();
+
+        // 使用UTC时区确保一致性
+        ZoneId zoneId = ZoneId.of("UTC");
+        LocalDate start = startDate.toInstant().atZone(zoneId).toLocalDate();
+        LocalDate end = endDate.toInstant().atZone(zoneId).toLocalDate();
+
+        // 计算天数差
+        long daysBetween = ChronoUnit.DAYS.between(start, end);
+
+        // 生成日期范围（包括起始和结束日期）
+        for (int i = 0; i <= daysBetween; i++) {
+            LocalDate currentDate = start.plusDays(i);
+            dateRange.add(DateUtils.parseDate(currentDate.toString(), "yyyy-MM-dd"));
+        }
+
+        return dateRange;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/portrait/UserBasicPortraitController.java

@@ -0,0 +1,121 @@
+package com.sundot.airport.web.controller.portrait;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
+import com.sundot.airport.common.domain.portrait.ModularIndicatorResult;
+import com.sundot.airport.common.dto.UserInfo;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.enums.portrait.UserType;
+import com.sundot.airport.system.mapper.SysUserMapper;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.portrait.UserPortraitService;
+import com.sundot.airport.web.core.cache.UserCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * 用户画像基本信息
+ */
+@RestController
+@RequestMapping("/user/basic/portrait")
+public class UserBasicPortraitController extends BaseController {
+
+    @Autowired
+    private UserPortraitService userPortraitService;
+
+    @Autowired
+    private UserCache userCache;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+
+    /**
+     * 获取指定模块的指标值
+     *
+     * @param modules 指定的模块列表，用逗号分隔
+     * @return 指定模块的指标值集合
+     */
+    @Cacheable(
+            value = "base_module_info",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/module/info")
+    public AjaxResult moduleInfo(IndicatorCalculateParams params,
+                                 @RequestParam(required = false) String modules) {
+        ModularIndicatorResult result = new ModularIndicatorResult();
+        try {
+            // 将字符串转换为枚举
+            UserType userTypeEnum = UserType.fromString(params.getUserTypeStr());
+            params.setUserType(userTypeEnum);
+
+            // 设置默认时间范围
+            java.util.Date endTime = Optional.ofNullable(params.getEndTime()).orElse(new java.util.Date());
+            java.util.Date startTime = Optional.ofNullable(params.getStartTime())
+                    .orElse(java.util.Date.from(endTime.toInstant().minusSeconds(7862400L)));
+            params.setStartTime(startTime);
+            params.setEndTime(endTime);
+            if (!UserType.PERSONAL.equals(userTypeEnum)) {
+                if (ObjectUtil.isNotEmpty(params.getUserId()) && ObjectUtil.isEmpty(params.getDeptId())) {
+                    SysUser user = sysUserMapper.selectUserById(params.getUserId());
+                    if (ObjectUtil.isEmpty(user)) {
+                        return AjaxResult.success(result);
+                    }
+                    params.setDeptId(user.getDeptId());
+                }
+                // 根据这个人的部门id，获取这个人部门下的所有安检员和班组长
+                List<SysUser> deptUsers = new ArrayList<>();
+                if (params.getDeptId() != null) {
+                    deptUsers = sysUserMapper.selectUserListByRoleKeyAndDeptId(
+                            Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()),
+                            params.getDeptId());
+                    if (CollectionUtil.isEmpty(deptUsers)) {
+                        return AjaxResult.success(result);
+                    }
+                }
+                if (CollectionUtil.isEmpty(deptUsers)) {
+                    return AjaxResult.success(result);
+                }
+                List<Long> userIds = deptUsers.stream()
+                        .map(SysUser::getUserId)
+                        .collect(Collectors.toList());
+                if (CollectionUtil.isEmpty(userIds)) {
+                    return AjaxResult.success(result);
+                }
+                params.setUserIds(userIds);
+            }
+
+
+            if (modules != null && !modules.isEmpty()) {
+                // 解析模块列表
+                List<String> moduleList = Arrays.asList(modules.split(","));
+                result = userPortraitService.getIndicators(params, moduleList);
+            } else {
+                // 获取所有模块的指标数据
+                result = userPortraitService.getIndicators(params);
+            }
+
+            return AjaxResult.success(result);
+        } catch (Exception e) {
+            return AjaxResult.error("获取用户画像信息失败：" + e.getMessage());
+        }
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/quality/ItemCategoryStatsController.java

@@ -0,0 +1,416 @@
+package com.sundot.airport.web.controller.quality;
+
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.statistics.TimeDimensionParams;
+import com.sundot.airport.common.utils.DeptUtils;
+import com.sundot.airport.item.domain.*;
+import com.sundot.airport.item.domain.ItemLargeScreenInfoDto;
+import com.sundot.airport.item.domain.ItemLargeScreenTimeSpanDto;
+import com.sundot.airport.item.domain.dto.ChannelRankingStatsDTO;
+import com.sundot.airport.item.domain.dto.ConcealmentPositionStatsDTO;
+import com.sundot.airport.item.domain.dto.ItemCategoryStatsDTO;
+import com.sundot.airport.item.domain.dto.PostCategoryStatsDTO;
+import com.sundot.airport.item.domain.home.SeizureReportDTO;
+import com.sundot.airport.item.service.IItemCategoryStatsService;
+import com.sundot.airport.item.service.ItemLargeScreenService;
+import com.sundot.airport.system.service.ISysDeptService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 物品分类统计Controller
+ * 提供物品分类统计相关接口
+ *
+ * @author wangxx
+ * @date 2024-07-23
+ */
+@Slf4j
+@RestController
+@RequestMapping("/quality/item-category-stats")
+@Api(tags = "物品分类统计")
+public class ItemCategoryStatsController extends BaseController {
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+
+    @Autowired
+    private IItemCategoryStatsService iItemCategoryStatsService;
+
+    @Autowired
+    private ItemLargeScreenService itemLargeScreenService;
+
+
+    /**
+     * 获取物品分类统计（全站整体数据）
+     * 支持按年、季度、月维度统计
+     */
+    @ApiOperation("获取物品分类统计")
+    @GetMapping("/category-stats")
+    public AjaxResult getItemCategoryStats(TimeDimensionParams params) {
+        try {
+            // 获取当前用户所在站点ID
+            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+            if (topSiteId == null) {
+                return AjaxResult.error("无法找到有效的站点信息");
+            }
+
+            ItemCategoryStatsDTO stationCategoryStats = iItemCategoryStatsService.getStationCategoryStats(params, topSiteId);
+
+            return AjaxResult.success("获取成功", stationCategoryStats);
+
+        } catch (Exception e) {
+            log.error("获取物品分类统计失败", e);
+            return AjaxResult.error("获取物品分类统计失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取查获时段趋势图
+     */
+    @ApiOperation("获取查获时段趋势图")
+    @GetMapping("/seizure-time-trend")
+    public AjaxResult getSeizureTimeTrend(TimeDimensionParams params) {
+        try {
+            // 获取当前用户所在站点ID
+            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+            if (topSiteId == null) {
+                return AjaxResult.error("无法找到有效的站点信息");
+            }
+
+            // 计算时间范围
+            TimeDimensionParams timeParams = calculateTimeRange(params);
+            BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+            dto.setStartDate(timeParams.getStartTime());
+            dto.setEndDate(timeParams.getEndTime());
+            dto.setInspectStationId(topSiteId);
+            // 设置大队、科室、班、人员筛选条件
+            dto.setInspectBrigadeId(params.getBrigadeId());
+            dto.setInspectDepartmentId(params.getDepartmentId());
+            dto.setInspectTeamId(params.getTeamId());
+            dto.setUserId(params.getUserId());
+            List<ItemLargeScreenTimeSpanDto> result = itemLargeScreenService.appTimeSpan(dto);
+            return AjaxResult.success("获取成功", result);
+
+        } catch (Exception e) {
+            log.error("获取查获时段趋势失败", e);
+            return AjaxResult.error("获取查获时段趋势失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取隐匿夹带部位分布统计（饼状图数据）
+     * 支持按年、季度、月维度统计
+     */
+    @ApiOperation("获取隐匿夹带部位分布统计")
+    @GetMapping("/concealment-position-stats")
+    public AjaxResult getConcealmentPositionStats(TimeDimensionParams params) {
+        try {
+            // 获取当前用户所在站点ID
+            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+            if (topSiteId == null) {
+                return AjaxResult.error("无法找到有效的站点信息");
+            }
+
+            ConcealmentPositionStatsDTO stationConcealmentPositionStats =
+                    iItemCategoryStatsService.getStationConcealmentPositionStats(params, topSiteId);
+
+            return AjaxResult.success("获取成功", stationConcealmentPositionStats);
+
+        } catch (Exception e) {
+            log.error("获取隐匿夹带部位分布统计失败", e);
+            return AjaxResult.error("获取隐匿夹带部位分布统计失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取岗位分类统计（饼状图数据）
+     * 支持按年、季度、月维度统计
+     */
+    @ApiOperation("获取岗位分类统计")
+    @GetMapping("/post-category-stats")
+    public AjaxResult getPostCategoryStats(TimeDimensionParams params) {
+        try {
+            // 获取当前用户所在站点ID
+            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+            if (topSiteId == null) {
+                return AjaxResult.error("无法找到有效的站点信息");
+            }
+
+            PostCategoryStatsDTO stationPostCategoryStats =
+                    iItemCategoryStatsService.getStationPostCategoryStats(params, topSiteId);
+
+            return AjaxResult.success("获取成功", stationPostCategoryStats);
+
+        } catch (Exception e) {
+            log.error("获取岗位分类统计失败", e);
+            return AjaxResult.error("获取岗位分类统计失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取通道排名统计（表格数据）
+     * 支持按年、季度、月维度统计
+     */
+    @ApiOperation("获取通道排名统计")
+    @GetMapping("/channel-ranking-stats")
+    public AjaxResult getChannelRankingStats(TimeDimensionParams params) {
+        try {
+            // 获取当前用户所在站点ID
+            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+            if (topSiteId == null) {
+                return AjaxResult.error("无法找到有效的站点信息");
+            }
+
+            ChannelRankingStatsDTO stationChannelRankingStats =
+                    iItemCategoryStatsService.getStationChannelRankingStats(params, topSiteId);
+
+            return AjaxResult.success("获取成功", stationChannelRankingStats);
+
+        } catch (Exception e) {
+            log.error("获取通道排名统计失败", e);
+            return AjaxResult.error("获取通道排名统计失败: " + e.getMessage());
+        }
+    }
+
+
+    /**
+     * 各大队查获排名
+     */
+    @ApiOperation("获取各大队查获排名")
+    @GetMapping("/brigade-ranking")
+    public AjaxResult getBrigadeRanking(TimeDimensionParams params) {
+        List<SeizureReportDTO.BrigadeRankingItem> brigadeRankings = new ArrayList<>();
+        try {
+            // 获取当前用户所在站点ID
+            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+            if (topSiteId == null) {
+                return AjaxResult.error("无法找到有效的站点信息");
+            }
+            brigadeRankings = iItemCategoryStatsService.getBrigadeRanking(topSiteId, params);
+        } catch (Exception e) {
+            log.error("获取各科室查获排名失败", e);
+            return AjaxResult.error("获取各科室查获排名失败: " + e.getMessage());
+        }
+        return AjaxResult.success("获取成功", brigadeRankings);
+    }
+
+
+    /**
+     * 计算时间范围
+     */
+    private TimeDimensionParams calculateTimeRange(TimeDimensionParams params) {
+        TimeDimensionParams result = new TimeDimensionParams();
+
+        if (params.getYear() != null) {
+            // 按年、季度、月计算时间范围
+            int year = params.getYear();
+            int startMonth = 1;
+            int endMonth = 12;
+
+            if (params.getQuarter() != null) {
+                // 按季度
+                startMonth = (params.getQuarter() - 1) * 3 + 1;
+                endMonth = startMonth + 2;
+            } else if (params.getMonth() != null) {
+                // 按月
+                startMonth = params.getMonth();
+                endMonth = params.getMonth();
+            }
+
+            Calendar cal = Calendar.getInstance();
+            cal.set(year, startMonth - 1, 1, 0, 0, 0);
+            result.setStartTime(cal.getTime());
+
+            cal.set(year, endMonth - 1, cal.getActualMaximum(Calendar.DAY_OF_MONTH), 0, 0, 0);
+            result.setEndTime(cal.getTime());
+        } else {
+            // 使用传入的时间范围
+            result.setStartTime(params.getStartTime());
+            result.setEndTime(params.getEndTime());
+        }
+
+        return result;
+    }
+
+    /**
+     * 获取当前用户所在站点 ID
+     */
+    private Long getCurrentTopSiteId() {
+        return DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+    }
+
+    /**
+     * 将 TimeDimensionParams 转换为 BaseLargeScreenQueryParamDto
+     */
+    private BaseLargeScreenQueryParamDto convertToQueryParamDto(TimeDimensionParams params) {
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+
+        // 获取当前用户所在站点 ID
+        Long topSiteId = getCurrentTopSiteId();
+        if (topSiteId != null) {
+            dto.setInspectStationId(topSiteId);
+        }
+
+        // 计算时间范围
+        TimeDimensionParams timeParams = calculateTimeRange(params);
+        dto.setStartDate(timeParams.getStartTime());
+        dto.setEndDate(timeParams.getEndTime());
+
+        // 设置大队、科室、班、人员筛选条件
+        dto.setInspectBrigadeId(params.getBrigadeId());
+        dto.setInspectDepartmentId(params.getDepartmentId());
+        dto.setInspectTeamId(params.getTeamId());
+        dto.setUserId(params.getUserId());
+
+        return dto;
+    }
+
+    /**
+     * 移交公安数据
+     * 支持按年、季度、月维度统计
+     */
+    @ApiOperation("移交公安数据")
+    @GetMapping("/police-data")
+    public AjaxResult getPoliceData(TimeDimensionParams params) {
+        try {
+            BaseLargeScreenQueryParamDto dto = convertToQueryParamDto(params);
+            List<ItemLargeScreenInfoDto> result = itemLargeScreenService.police(dto);
+
+            List<ItemLargeScreenPoliceGroupDto> tableData = result.stream().map(item -> {
+                ItemLargeScreenPoliceGroupDto groupDto = new ItemLargeScreenPoliceGroupDto();
+                groupDto.setBrigadeName(item.getInspectBrigadeName());
+                groupDto.setDepartmentName(item.getInspectDepartmentName());
+                groupDto.setTeamName(item.getInspectTeamName());
+                groupDto.setUserName(item.getInspectUserName());
+                groupDto.setItemName(item.getCategoryNameTwo());
+                groupDto.setQuantity(item.getQuantity());
+
+                // 查获部位拼接
+                StringBuilder position = new StringBuilder();
+                if (item.getCheckPositionNameOne() != null && !item.getCheckPositionNameOne().isEmpty()) {
+                    position.append(item.getCheckPositionNameOne());
+                }
+                if (item.getCheckPositionNameTwo() != null && !item.getCheckPositionNameTwo().isEmpty()) {
+                    if (position.length() > 0) {
+                        position.append("/");
+                    }
+                    position.append(item.getCheckPositionNameTwo());
+                }
+                if (item.getCheckPositionSpecific() != null && !item.getCheckPositionSpecific().isEmpty()) {
+                    if (position.length() > 0) {
+                        position.append("/");
+                    }
+                    position.append(item.getCheckPositionSpecific());
+                }
+                groupDto.setPositionName(position.toString());
+                groupDto.setSeizureTime(item.getSeizureTime());
+                groupDto.setChannelName(item.getChannelName());
+                return groupDto;
+            }).collect(Collectors.toList());
+
+            return AjaxResult.success("获取成功", tableData);
+        } catch (Exception e) {
+            log.error("获取移交公安数据失败", e);
+            return AjaxResult.error("获取移交公安数据失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 移交公安数据统计
+     * 支持按年、季度、月维度统计
+     */
+    @ApiOperation("移交公安数据统计")
+    @GetMapping("/police-stats")
+    public AjaxResult getPoliceStats(TimeDimensionParams params) {
+        try {
+            BaseLargeScreenQueryParamDto dto = convertToQueryParamDto(params);
+            ItemLargeScreenPoliceStatsDto result = itemLargeScreenService.getPoliceStats(dto);
+            return AjaxResult.success("获取成功", result);
+        } catch (Exception e) {
+            log.error("获取移交公安数据统计失败", e);
+            return AjaxResult.error("获取移交公安数据统计失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * X 光机漏检数据
+     * 支持按年、季度、月维度统计
+     */
+    @ApiOperation("X 光机漏检数据")
+    @GetMapping("/xray-miss-check")
+    public AjaxResult getXRayMissCheck(TimeDimensionParams params) {
+        try {
+            BaseLargeScreenQueryParamDto dto = convertToQueryParamDto(params);
+            List<ItemXRayMissCheckDto> result = itemLargeScreenService.xRayMissCheck(dto);
+            return AjaxResult.success("获取成功", result);
+        } catch (Exception e) {
+            log.error("获取 X 光机漏检数据失败", e);
+            return AjaxResult.error("获取 X 光机漏检数据失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * X 光机漏检人员统计 TOP3
+     * 支持按年、季度、月维度统计
+     */
+    @ApiOperation("X 光机漏检人员统计 TOP3")
+    @GetMapping("/xray-miss-check-top3")
+    public AjaxResult getXRayMissCheckTop3(TimeDimensionParams params) {
+        try {
+            BaseLargeScreenQueryParamDto dto = convertToQueryParamDto(params);
+            List<ItemXRayMissCheckUserStatsDto> result = itemLargeScreenService.xRayMissCheckUserStatsTop3(dto);
+            return AjaxResult.success("获取成功", result);
+        } catch (Exception e) {
+            log.error("获取 X 光机漏检人员统计 TOP3 失败", e);
+            return AjaxResult.error("获取 X 光机漏检人员统计 TOP3 失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 异常查获数据
+     * 支持按年、季度、月维度统计
+     */
+    @ApiOperation("异常查获数据")
+    @GetMapping("/abnormal-seizure-data")
+    public AjaxResult getAbnormalSeizureData(TimeDimensionParams params) {
+        try {
+            BaseLargeScreenQueryParamDto dto = convertToQueryParamDto(params);
+            List<ItemAbnormalSeizureDto> result = itemLargeScreenService.getAbnormalSeizureData(dto);
+            return AjaxResult.success("获取成功", result);
+        } catch (Exception e) {
+            log.error("获取异常查获数据失败", e);
+            return AjaxResult.error("获取异常查获数据失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 异常查获数据 TOP3（3 个高于 +3 个低于）
+     * 支持按年、季度、月维度统计
+     */
+    @ApiOperation("异常查获数据 TOP3")
+    @GetMapping("/abnormal-seizure-data-top3")
+    public AjaxResult getAbnormalSeizureDataTop3(TimeDimensionParams params) {
+        try {
+            BaseLargeScreenQueryParamDto dto = convertToQueryParamDto(params);
+            ItemAbnormalSeizureRankDto result = itemLargeScreenService.getAbnormalSeizureDataTop3(dto);
+            return AjaxResult.success("获取成功", result);
+        } catch (Exception e) {
+            log.error("获取异常查获数据 TOP3 失败", e);
+            return AjaxResult.error("获取异常查获数据 TOP3 失败：" + e.getMessage());
+        }
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/quality/QualificationLevelStatsController.java

@@ -0,0 +1,541 @@
+package com.sundot.airport.web.controller.quality;
+
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.utils.DeptUtils;
+import com.sundot.airport.item.domain.dto.QualificationLevelStatsDTO;
+import com.sundot.airport.system.domain.QualificationLevelConverter;
+import com.sundot.airport.system.domain.portrait.QualificationStats;
+import com.sundot.airport.system.mapper.portrait.QualificationLevelIndicatorMapper;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysPostService;
+import com.sundot.airport.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 资质等级统计控制器
+ * 提供资质等级统计的API接口
+ *
+ * @author wangxx
+ */
+@Api(tags = "资质等级统计")
+@RestController
+@RequestMapping("/statistics/qualification")
+public class QualificationLevelStatsController extends BaseController {
+
+    @Autowired
+    private QualificationLevelIndicatorMapper qualificationLevelMapper;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private ISysPostService sysPostService;
+
+
+    /**
+     * 固定的资质等级列表（初级、中级、高级）
+     */
+    private static final List<String> QUALIFICATION_LEVELS = Arrays.asList(
+            "初级", "中级", "高级"
+    );
+
+    /**
+     * 获取饼状图数据（资质等级分布）
+     * 支持按部门 ID、用户 ID 进行统计
+     */
+    @ApiOperation("获取饼状图数据")
+    @GetMapping("/pie-chart")
+    public AjaxResult getPieChartData(
+            @RequestParam(required = false) Long deptId) {
+
+        try {
+            List<Long> targetUserIds;
+
+            if (deptId != null) {
+                // 按部门（大队/科室/班组）统计
+                targetUserIds = getAllUserIdsUnderDept(deptId);
+            } else {
+                // 默认按全站统计
+                Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+                if (topSiteId == null) {
+                    return AjaxResult.error("无法找到有效的站点信息");
+                }
+                targetUserIds = getAllUserIdsUnderSite(topSiteId);
+            }
+
+            if (targetUserIds.isEmpty()) {
+                return AjaxResult.success("获取成功", new QualificationLevelStatsDTO.PieChartData());
+            }
+
+            QualificationLevelStatsDTO.PieChartData pieChart = calculatePieChartData(targetUserIds);
+            return AjaxResult.success("获取成功", pieChart);
+
+        } catch (Exception e) {
+            logger.error("获取饼状图数据失败", e);
+            return AjaxResult.error("获取饼状图数据失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取柱状图数据（资质等级分布）
+     * 支持按大队ID、科室ID、班组ID、用户ID 进行统计
+     */
+    @ApiOperation("获取柱状图数据")
+    @GetMapping("/bar-chart")
+    public AjaxResult getBarChartData(
+            @RequestParam(required = false) Long deptId,
+            @RequestParam(required = false) Long userId) {
+
+        try {
+            QualificationLevelStatsDTO.BarChartData barChart;
+
+            // 优先处理用户 ID 参数
+            if (userId != null) {
+                // 按个人统计，返回该用户的资质等级
+                barChart = calculateBarChartDataForUser(userId);
+            } else if (deptId != null) {
+                // 按部门 ID 统计，根据部门类型决定返回逻辑
+                barChart = calculateBarChartDataForDept(deptId);
+            } else {
+                // 未传参，默认统计全站下各科室的分布
+                Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+                if (topSiteId == null) {
+                    return AjaxResult.error("无法找到有效的站点信息");
+                }
+                barChart = calculateBarChartDataOptimized(topSiteId);
+            }
+
+            return AjaxResult.success("获取成功", barChart);
+
+        } catch (Exception e) {
+            logger.error("获取柱状图数据失败", e);
+            return AjaxResult.error("获取柱状图数据失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 计算饼状图数据（全站范围资质等级分布）
+     */
+    private QualificationLevelStatsDTO.PieChartData calculatePieChartData(List<Long> userIds) {
+        QualificationLevelStatsDTO.PieChartData pieChart = new QualificationLevelStatsDTO.PieChartData();
+
+        // 查询资质等级统计（暂不考虑时间参数，后续可根据需要扩展）
+        List<QualificationStats> statsList = qualificationLevelMapper.queryOrgQualificationLevelStats(userIds, null);
+
+        // 转换为分布数据
+        List<QualificationLevelStatsDTO.LevelDistribution> distributions = new ArrayList<>();
+        int totalPersons = 0;
+
+        // 统计实际存在的等级数据，按数据库存储的枚举值分组
+        Map<String, Integer> levelCountMap = statsList.stream()
+                .collect(Collectors.toMap(
+                        QualificationStats::getLevelName,
+                        QualificationStats::getCount,
+                        Integer::sum
+                ));
+
+        // 按（初级、中级、高级）分组统计
+        int juniorCount = levelCountMap.getOrDefault("LEVEL_FIVE", 0);  // 初级
+        int intermediateCount = levelCountMap.getOrDefault("LEVEL_FOUR", 0);  // 中级
+        int seniorCount = levelCountMap.getOrDefault("LEVEL_ONE", 0) +
+                levelCountMap.getOrDefault("LEVEL_TWO", 0) +
+                levelCountMap.getOrDefault("LEVEL_THREE", 0);  // 高级
+
+        totalPersons = userIds.size();
+
+        // 初级
+        QualificationLevelStatsDTO.LevelDistribution juniorDist = new QualificationLevelStatsDTO.LevelDistribution();
+        juniorDist.setLevelName("初级");
+        juniorDist.setCount(juniorCount);
+        juniorDist.setPercentage(totalPersons > 0 ?
+                new BigDecimal(juniorCount * 100.0 / totalPersons).setScale(2, RoundingMode.HALF_UP) :
+                BigDecimal.ZERO);
+        distributions.add(juniorDist);
+
+        // 中级
+        QualificationLevelStatsDTO.LevelDistribution intermediateDist = new QualificationLevelStatsDTO.LevelDistribution();
+        intermediateDist.setLevelName("中级");
+        intermediateDist.setCount(intermediateCount);
+        intermediateDist.setPercentage(totalPersons > 0 ?
+                new BigDecimal(intermediateCount * 100.0 / totalPersons).setScale(2, RoundingMode.HALF_UP) :
+                BigDecimal.ZERO);
+        distributions.add(intermediateDist);
+
+        // 高级
+        QualificationLevelStatsDTO.LevelDistribution seniorDist = new QualificationLevelStatsDTO.LevelDistribution();
+        seniorDist.setLevelName("高级");
+        seniorDist.setCount(seniorCount);
+        seniorDist.setPercentage(totalPersons > 0 ?
+                new BigDecimal(seniorCount * 100.0 / totalPersons).setScale(2, RoundingMode.HALF_UP) :
+                BigDecimal.ZERO);
+        distributions.add(seniorDist);
+
+        pieChart.setData(distributions);
+        pieChart.setTotalPersons(totalPersons);
+
+        return pieChart;
+    }
+
+    /**
+     * 计算柱状图数据
+     * - 站级/大队级/科级：返回下属组织的资质等级统计
+     * - 班组：返回班组内每个员工的资质等级
+     */
+    private QualificationLevelStatsDTO.BarChartData calculateBarChartDataForDept(Long deptId) {
+        QualificationLevelStatsDTO.BarChartData barChart = new QualificationLevelStatsDTO.BarChartData();
+
+        SysDept sysDept = sysDeptService.selectDeptById(deptId);
+        if (sysDept == null) {
+            barChart.setBrigades(new ArrayList<>());
+            return barChart;
+        }
+
+        List<SysDept> targetDepts = new ArrayList<>();
+
+        // 根据部门类型决定查询逻辑
+        if (DeptTypeEnum.TEAMS.getCode().equals(sysDept.getDeptType())) {
+            // 班组级别：查询该班组下的所有用户，返回每个人的资质等级
+            return calculateBarChartDataForTeam(deptId);
+        } else {
+            // 站级/大队级/科级：查询该部门下的所有子部门
+            List<SysDept> children = sysDeptService.selectChildrenDeptById(deptId);
+            if (DeptTypeEnum.MANAGER.getCode().equals(sysDept.getDeptType())) {
+                targetDepts.addAll(children.stream()
+                        .filter(dept -> DeptTypeEnum.TEAMS.getCode().equals(dept.getDeptType()))
+                        .collect(Collectors.toList()));
+            } else if (DeptTypeEnum.BRIGADE.getCode().equals(sysDept.getDeptType())) {
+                targetDepts.addAll(children.stream()
+                        .filter(dept -> DeptTypeEnum.MANAGER.getCode().equals(dept.getDeptType()))
+                        .collect(Collectors.toList()));
+            } else if (DeptTypeEnum.STATION.getCode().equals(sysDept.getDeptType())) {
+                targetDepts.addAll(children.stream()
+                        .filter(dept -> DeptTypeEnum.BRIGADE.getCode().equals(dept.getDeptType()))
+                        .collect(Collectors.toList()));
+
+            }
+            if (targetDepts.isEmpty()) {
+                barChart.setBrigades(new ArrayList<>());
+                return barChart;
+            }
+        }
+
+        // 批量获取所有子部门的用户 ID
+        Map<Long, List<Long>> deptUserIdsMap = batchGetUserIdsByBrigades(targetDepts);
+
+        // 批量查询所有子部门的资质统计数据
+        Map<Long, List<QualificationStats>> deptStatsMap = batchQueryQualificationStats(deptUserIdsMap);
+
+        // 构建部门数据
+        List<QualificationLevelStatsDTO.BrigadeData> deptDataList = targetDepts.stream()
+                .map(dept -> {
+                    QualificationLevelStatsDTO.BrigadeData deptData = new QualificationLevelStatsDTO.BrigadeData();
+                    deptData.setDeptId(dept.getDeptId());
+                    deptData.setDeptName(dept.getDeptName());
+
+                    List<QualificationStats> deptStats = deptStatsMap.get(dept.getDeptId());
+                    if (deptStats != null && !deptStats.isEmpty()) {
+                        List<QualificationLevelStatsDTO.LevelCount> levelCounts = convertToLevelCounts(deptStats);
+                        deptData.setLevelCounts(levelCounts);
+                    } else {
+                        // 部门无用户或无统计数据，初始化为空数据
+                        List<QualificationLevelStatsDTO.LevelCount> emptyCounts = QUALIFICATION_LEVELS.stream()
+                                .map(level -> {
+                                    QualificationLevelStatsDTO.LevelCount count = new QualificationLevelStatsDTO.LevelCount();
+                                    count.setLevelName(level);
+                                    count.setCount(0);
+                                    return count;
+                                })
+                                .collect(Collectors.toList());
+                        deptData.setLevelCounts(emptyCounts);
+                    }
+
+                    return deptData;
+                })
+                .collect(Collectors.toList());
+
+        barChart.setBrigades(deptDataList);
+        return barChart;
+    }
+
+    /**
+     * 计算班组的柱状图数据（返回班组内每个员工的资质等级）
+     */
+    private QualificationLevelStatsDTO.BarChartData calculateBarChartDataForTeam(Long teamId) {
+        QualificationLevelStatsDTO.BarChartData barChart = new QualificationLevelStatsDTO.BarChartData();
+
+        // 获取班组下的所有用户
+        List<Long> userIds = getAllUserIdsUnderDept(teamId);
+
+        if (userIds.isEmpty()) {
+            barChart.setBrigades(new ArrayList<>());
+            return barChart;
+        }
+
+        // 查询每个用户的资质等级
+        List<QualificationLevelStatsDTO.BrigadeData> userDataList = new ArrayList<>();
+        for (Long uid : userIds) {
+            SysUser user = sysUserService.selectUserById(uid);
+            if (user == null || "2".equals(user.getDelFlag()) || "1".equals(user.getStatus())) {
+                continue; // 跳过已删除或停用的用户
+            }
+
+            // 查询该用户的资质等级
+            String level = qualificationLevelMapper.queryPersonalQualificationLevel(uid);
+            String displayLevel = convertToDisplayLevel(level);
+
+            QualificationLevelStatsDTO.BrigadeData userData = new QualificationLevelStatsDTO.BrigadeData();
+            userData.setDeptId(uid); // 使用用户 ID 作为标识
+            userData.setDeptName(user.getNickName() != null ? user.getNickName() : user.getUserName());
+            userData.setQualificationLevel(displayLevel); // 直接设置资质等级
+
+            userDataList.add(userData);
+        }
+
+        barChart.setBrigades(userDataList);
+        return barChart;
+    }
+
+    /**
+     * 计算个人的柱状图数据（返回单个用户的资质等级）
+     */
+    private QualificationLevelStatsDTO.BarChartData calculateBarChartDataForUser(Long userId) {
+        QualificationLevelStatsDTO.BarChartData barChart = new QualificationLevelStatsDTO.BarChartData();
+
+        SysUser user = sysUserService.selectUserById(userId);
+        if (user == null || "2".equals(user.getDelFlag()) || "1".equals(user.getStatus())) {
+            barChart.setBrigades(new ArrayList<>());
+            return barChart;
+        }
+
+        // 查询该用户的资质等级
+        String level = qualificationLevelMapper.queryPersonalQualificationLevel(userId);
+        String displayLevel = convertToDisplayLevel(level);
+
+        // 构建用户数据
+        QualificationLevelStatsDTO.BrigadeData userData = new QualificationLevelStatsDTO.BrigadeData();
+        userData.setDeptId(userId);
+        userData.setDeptName(user.getNickName() != null ? user.getNickName() : user.getUserName());
+        userData.setQualificationLevel(displayLevel); // 直接设置资质等级
+        userData.setSysPostList(sysPostService.selectPostListsByUserId(userId));
+
+        List<QualificationLevelStatsDTO.BrigadeData> departments = new ArrayList<>();
+        departments.add(userData);
+        barChart.setBrigades(departments);
+
+        return barChart;
+    }
+
+    /**
+     * 将数据库枚举值转换为显示名称
+     */
+    private String convertToDisplayLevel(String dbValue) {
+        if (dbValue == null || dbValue.trim().isEmpty()) {
+            return null;
+        }
+        switch (dbValue.toUpperCase()) {
+            case "LEVEL_FIVE":
+                return "初级";
+            case "LEVEL_FOUR":
+                return "中级";
+            case "LEVEL_ONE":
+            case "LEVEL_TWO":
+            case "LEVEL_THREE":
+                return "高级";
+            default:
+                return dbValue;
+        }
+    }
+
+    /**
+     * 计算柱状图数据（各大队资质等级分布）
+     */
+    private QualificationLevelStatsDTO.BarChartData calculateBarChartDataOptimized(Long siteId) {
+        QualificationLevelStatsDTO.BarChartData barChart = new QualificationLevelStatsDTO.BarChartData();
+
+        // 获取站点下的所有大队
+        List<SysDept> brigades = getBrigadesUnderSite(siteId);
+        if (brigades.isEmpty()) {
+            barChart.setBrigades(new ArrayList<>());
+            return barChart;
+        }
+
+        // 批量获取所有大队的用户ID
+        Map<Long, List<Long>> deptUserIdsMap = batchGetUserIdsByBrigades(brigades);
+
+        // 批量查询所有大队的资质统计数据
+        Map<Long, List<QualificationStats>> deptStatsMap = batchQueryQualificationStats(deptUserIdsMap);
+
+        // 构建大队数据
+        List<QualificationLevelStatsDTO.BrigadeData> deptDataList = brigades.stream()
+                .map(dept -> {
+                    QualificationLevelStatsDTO.BrigadeData deptData = new QualificationLevelStatsDTO.BrigadeData();
+                    deptData.setDeptId(dept.getDeptId());
+                    deptData.setDeptName(dept.getDeptName());
+
+                    List<QualificationStats> deptStats = deptStatsMap.get(dept.getDeptId());
+                    if (deptStats != null && !deptStats.isEmpty()) {
+                        List<QualificationLevelStatsDTO.LevelCount> levelCounts = convertToLevelCounts(deptStats);
+                        deptData.setLevelCounts(levelCounts);
+                    } else {
+                        // 大队无用户或无统计数据，初始化为空数据
+                        List<QualificationLevelStatsDTO.LevelCount> emptyCounts = QUALIFICATION_LEVELS.stream()
+                                .map(level -> {
+                                    QualificationLevelStatsDTO.LevelCount count = new QualificationLevelStatsDTO.LevelCount();
+                                    count.setLevelName(level);
+                                    count.setCount(0);
+                                    return count;
+                                })
+                                .collect(Collectors.toList());
+                        deptData.setLevelCounts(emptyCounts);
+                    }
+
+                    return deptData;
+                })
+                .collect(Collectors.toList());
+
+        barChart.setBrigades(deptDataList);
+        return barChart;
+    }
+
+    /**
+     * 批量获取大队用户ID映射
+     */
+    private Map<Long, List<Long>> batchGetUserIdsByBrigades(List<SysDept> brigades) {
+        Map<Long, List<Long>> deptUserIdsMap = new HashMap<>();
+
+        for (SysDept dept : brigades) {
+            List<Long> deptUserIds = getAllUserIdsUnderDept(dept.getDeptId());
+            deptUserIdsMap.put(dept.getDeptId(), deptUserIds);
+        }
+
+        return deptUserIdsMap;
+    }
+
+    /**
+     * 批量查询资质统计数据
+     */
+    private Map<Long, List<QualificationStats>> batchQueryQualificationStats(Map<Long, List<Long>> deptUserIdsMap) {
+        Map<Long, List<QualificationStats>> deptStatsMap = new HashMap<>();
+
+        // 过滤掉没有用户的大队
+        Map<Long, List<Long>> validDeptUserIdsMap = deptUserIdsMap.entrySet().stream()
+                .filter(entry -> !entry.getValue().isEmpty())
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+        if (validDeptUserIdsMap.isEmpty()) {
+            return deptStatsMap;
+        }
+
+        for (Map.Entry<Long, List<Long>> entry : validDeptUserIdsMap.entrySet()) {
+            Long deptId = entry.getKey();
+            List<Long> userIds = entry.getValue();
+            List<QualificationStats> stats = qualificationLevelMapper.queryOrgQualificationLevelStats(userIds, null);
+            deptStatsMap.put(deptId, stats);
+        }
+
+        return deptStatsMap;
+    }
+
+    /**
+     * 将资质统计转换为等级人数数据（初级、中级、高级）
+     */
+    private List<QualificationLevelStatsDTO.LevelCount> convertToLevelCounts(List<QualificationStats> statsList) {
+        // 按数据库存储的枚举值分组统计
+        Map<String, Integer> countMap = statsList.stream()
+                .collect(Collectors.toMap(QualificationStats::getLevelName, QualificationStats::getCount));
+
+        // 计算初级、中级、高级的人数
+        int juniorCount = countMap.getOrDefault("LEVEL_FIVE", 0);  // 初级
+        int intermediateCount = countMap.getOrDefault("LEVEL_FOUR", 0);  // 中级
+        int seniorCount = countMap.getOrDefault("LEVEL_ONE", 0) +
+                countMap.getOrDefault("LEVEL_TWO", 0) +
+                countMap.getOrDefault("LEVEL_THREE", 0);  // 高级
+
+        List<QualificationLevelStatsDTO.LevelCount> levelCounts = new ArrayList<>();
+
+        QualificationLevelStatsDTO.LevelCount junior = new QualificationLevelStatsDTO.LevelCount();
+        junior.setLevelName("初级");
+        junior.setCount(juniorCount);
+        levelCounts.add(junior);
+
+        QualificationLevelStatsDTO.LevelCount intermediate = new QualificationLevelStatsDTO.LevelCount();
+        intermediate.setLevelName("中级");
+        intermediate.setCount(intermediateCount);
+        levelCounts.add(intermediate);
+
+        QualificationLevelStatsDTO.LevelCount senior = new QualificationLevelStatsDTO.LevelCount();
+        senior.setLevelName("高级");
+        senior.setCount(seniorCount);
+        levelCounts.add(senior);
+
+        return levelCounts;
+    }
+
+
+    /**
+     * 获取站点下的所有用户ID
+     */
+    private List<Long> getAllUserIdsUnderSite(Long siteId) {
+        List<Long> userIds = new ArrayList<>();
+
+        // 获取站点本身及其下属部门
+        List<SysDept> allDepts = sysDeptService.selectChildrenDeptById(siteId);
+        allDepts.add(0, sysDeptService.selectDeptById(siteId)); // 添加站点本身
+
+        // 获取各部门下的用户
+        for (SysDept dept : allDepts) {
+            if (Objects.nonNull(dept)) {
+                List<Long> deptUserIds = sysUserService.selectUserByDeptId(dept.getDeptId()).stream()
+                        .map(SysUser::getUserId)
+                        .collect(Collectors.toList());
+                userIds.addAll(deptUserIds);
+            }
+        }
+
+        return userIds.stream().distinct().collect(Collectors.toList());
+    }
+
+    /**
+     * 获取站点下的所有大队
+     */
+    private List<SysDept> getBrigadesUnderSite(Long siteId) {
+        List<SysDept> children = sysDeptService.selectChildrenDeptById(siteId);
+        return children.stream()
+                .filter(dept -> DeptTypeEnum.BRIGADE.getCode().equals(dept.getDeptType()))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取部门下的所有用户ID
+     */
+    private List<Long> getAllUserIdsUnderDept(Long deptId) {
+        List<SysUser> sysUserList = sysUserService.selectUserByDeptId(deptId);
+        return sysUserList.stream()
+                .map(SysUser::getUserId)
+                .collect(Collectors.toList());
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/quality/SimpleAttendancePersonController.java

@@ -0,0 +1,642 @@
+package com.sundot.airport.web.controller.quality;
+
+import com.sundot.airport.attendance.calculator.AttendancePersonCountCalculator;
+import com.sundot.airport.attendance.calculator.BrigadeAttendancePersonCountCalculator;
+import com.sundot.airport.attendance.dto.AttendanceTrendDataDTO;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.attendance.dto.AttendancePersonStatsDTO;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.statistics.*;
+import com.sundot.airport.common.utils.DeptUtils;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.system.service.ISysDeptService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.sundot.airport.common.utils.SecurityUtils.getDeptId;
+
+/**
+ * 出勤人次控制器
+ * 根据时间维度返回总体+大队的人次数据
+ */
+@Api(tags = "出勤人次")
+@RestController
+@RequestMapping("/quality/attendance")
+public class SimpleAttendancePersonController {
+
+    @Autowired
+    private AttendancePersonCountCalculator overallCalculator; // 全站计算器
+
+    @Autowired
+    private BrigadeAttendancePersonCountCalculator deptCalculator; // 大队计算器
+
+    @Autowired
+    private MultiModelIndicatorCalculator multiModelIndicatorCalculator;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+
+    /**
+     * 出勤人次分析
+     * 支持按大队ID、科室ID、班组ID、用户ID 进行统计
+     */
+    @ApiOperation("出勤人次分析")
+    @PostMapping("/calculate")
+    public List<AttendancePersonStatsDTO> calculateStatistics(@RequestBody IndicatorCalculationParams params) {
+        List<AttendancePersonStatsDTO> results = new ArrayList<>();
+
+        if (params.getDeptId() != null || params.getUserId() != null) {
+            // 传入了部门 ID 或用户 ID，直接统计
+            results.add(createAttendancePersonStatsForParams(params));
+        } else {
+            // 未传入具体 ID，默认获取当前用户所在站点下的科室
+            Long topSiteId = DeptUtils.getTopSiteId(deptService.selectDeptById(getDeptId()));
+            List<SysDept> brigadeUnderSite = getBrigadesUnderSite(topSiteId);
+            brigadeUnderSite.add(deptService.selectDeptById(topSiteId));
+            brigadeUnderSite.forEach(dept -> {
+                results.add(createAttendancePersonStats(dept, params));
+            });
+        }
+
+        return results;
+    }
+
+    /**
+     * 出勤人次趋势数据
+     * 根据时间维度参数动态生成柱状图数据
+     * 支持月度（同比+环比）、季度（同比）、年度（同比）等多种展示方式
+     *
+     * @param params 时间维度参数（年、季度、月等）
+     * @return 趋势数据列表
+     */
+    @ApiOperation("出勤人次趋势数据")
+    @PostMapping("/trend-data")
+    public List<AttendanceTrendDataDTO> getTrendData(@RequestBody IndicatorCalculationParams params) {
+        // 根据传入参数决定统计策略
+        if (params.getDeptId() != null || params.getUserId() != null) {
+            // 传入了部门 ID 或用户 ID，返回简化版的趋势数据
+            return getSimpleTrendData(params);
+        }
+
+        // 默认按站点 + 三科模式统计
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+
+        // 根据时间维度类型决定展示策略
+        if (params.getMonth() != null) {
+            // 月度：展示当前月、上月、去年同期（同比+环比）
+            results.addAll(generateMonthlyTrendData(params));
+        } else if (params.getQuarter() != null) {
+            // 季度：展示当前季度和去年同期
+            results.addAll(generateQuarterlyTrendData(params));
+        } else if (params.getYear() != null) {
+            // 年度：仅展示当前年和去年（仅同比）
+            results.addAll(generateYearlyTrendData(params));
+        } else {
+            // 默认按月度处理
+            results.addAll(generateMonthlyTrendData(params));
+        }
+
+        return results;
+    }
+
+    /**
+     * 趋势数据（用于指定部门/个人的场景）
+     * 仅返回单条数据序列
+     */
+    private List<AttendanceTrendDataDTO> getSimpleTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+
+        // 根据时间维度类型决定展示策略
+        if (params.getMonth() != null) {
+            // 月度：展示当前月、上月、去年同期
+            results.addAll(generateSimpleMonthlyTrendData(params));
+        } else if (params.getQuarter() != null) {
+            // 季度：展示当前季度和去年同期
+            results.addAll(generateSimpleQuarterlyTrendData(params));
+        } else if (params.getYear() != null) {
+            // 年度：仅展示当前年和去年
+            results.addAll(generateSimpleYearlyTrendData(params));
+        } else {
+            // 默认按月度处理
+            results.addAll(generateSimpleMonthlyTrendData(params));
+        }
+
+        return results;
+    }
+
+    /**
+     * 月度趋势数据
+     */
+    private List<AttendanceTrendDataDTO> generateSimpleMonthlyTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+
+        // 计算当前月数据
+        AttendancePersonStatsDTO currentData = createAttendancePersonStatsForParams(params);
+
+        // 计算上月数据
+        IndicatorCalculationParams lastMonthParams = createLastMonthParams(params);
+        AttendancePersonStatsDTO lastMonthData = createAttendancePersonStatsForParams(lastMonthParams);
+
+        // 计算去年同期数据
+        IndicatorCalculationParams lastYearParams = createLastYearParams(params);
+        AttendancePersonStatsDTO lastYearData = createAttendancePersonStatsForParams(lastYearParams);
+
+        // 构造趋势数据点
+        results.add(createSimpleTrendDataPoint(getLastYearMonthLabel(params), lastYearData));
+        results.add(createSimpleTrendDataPoint(getLastMonthLabel(params), lastMonthData));
+        results.add(createSimpleTrendDataPoint(getMonthLabel(params), currentData));
+
+        return results;
+    }
+
+    /**
+     * 季度趋势数据
+     */
+    private List<AttendanceTrendDataDTO> generateSimpleQuarterlyTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+
+        // 计算当前季度数据
+        AttendancePersonStatsDTO currentData = createAttendancePersonStatsForParams(params);
+
+        // 计算上季度数据
+        IndicatorCalculationParams lastQuarterParams = createLastQuarterParams(params);
+        AttendancePersonStatsDTO lastQuarterData = createAttendancePersonStatsForParams(lastQuarterParams);
+
+        // 计算去年同期季度数据
+        IndicatorCalculationParams lastYearParams = createLastYearParams(params);
+        AttendancePersonStatsDTO lastYearData = createAttendancePersonStatsForParams(lastYearParams);
+
+        // 构造趋势数据点
+        results.add(createSimpleTrendDataPoint(getLastYearQuarterLabel(params), lastYearData));
+        results.add(createSimpleTrendDataPoint(getLastQuarterLabel(params), lastQuarterData));
+        results.add(createSimpleTrendDataPoint(getQuarterLabel(params), currentData));
+
+        return results;
+    }
+
+    /**
+     * 年度趋势数据
+     */
+    private List<AttendanceTrendDataDTO> generateSimpleYearlyTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+
+        // 计算当前年数据
+        AttendancePersonStatsDTO currentData = createAttendancePersonStatsForParams(params);
+
+        // 计算去年数据
+        IndicatorCalculationParams lastYearParams = createLastYearParams(params);
+        AttendancePersonStatsDTO lastYearData = createAttendancePersonStatsForParams(lastYearParams);
+
+        // 构造趋势数据点
+        results.add(createSimpleTrendDataPoint((params.getYear() - 1) + "年", lastYearData));
+        results.add(createSimpleTrendDataPoint(params.getYear() + "年", currentData));
+
+        return results;
+    }
+
+    /**
+     * 趋势数据点
+     */
+    private AttendanceTrendDataDTO createSimpleTrendDataPoint(String timeLabel, AttendancePersonStatsDTO stats) {
+        AttendanceTrendDataDTO data = new AttendanceTrendDataDTO();
+        data.setTimeLabel(timeLabel);
+        // 将单个统计值设置为 overall 字段
+        data.setOverall(stats.getCurrentValue() != null ? stats.getCurrentValue() : BigDecimal.ZERO);
+        return data;
+    }
+
+    /**
+     * 生成月度趋势数据（同比+环比）
+     * 展示：当前月、上月、去年同期
+     */
+    private List<AttendanceTrendDataDTO> generateMonthlyTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+
+        // 获取当前用户所在站点ID
+        Long topSiteId = DeptUtils.getTopSiteId(deptService.selectDeptById(getDeptId()));
+        List<SysDept> stationAndThreeDepts = getBrigadesUnderSite(topSiteId);
+        stationAndThreeDepts.add(deptService.selectDeptById(topSiteId));
+
+
+        // 计算当前月数据
+        List<AttendancePersonStatsDTO> currentList = calculateDeptStats(stationAndThreeDepts, params);
+
+        // 计算上月数据
+        IndicatorCalculationParams lastMonthParams = createLastMonthParams(params);
+        List<AttendancePersonStatsDTO> lastMonthList = calculateDeptStats(stationAndThreeDepts, lastMonthParams);
+
+        // 计算去年同期数据
+        IndicatorCalculationParams lastYearParams = createLastYearParams(params);
+        List<AttendancePersonStatsDTO> lastYearList = calculateDeptStats(stationAndThreeDepts, lastYearParams);
+
+
+        // 构造柱状图数据
+        AttendanceTrendDataDTO currentData = createTrendDataPoint(getMonthLabel(params), currentList);
+        AttendanceTrendDataDTO lastMonthData = createTrendDataPoint(getLastMonthLabel(params), lastMonthList);
+        AttendanceTrendDataDTO lastYearData = createTrendDataPoint(getLastYearMonthLabel(params), lastYearList);
+
+        results.add(lastYearData);
+        results.add(lastMonthData);
+        results.add(currentData);
+
+        return results;
+    }
+
+    /**
+     * 生成季度趋势数据（同比+环比）
+     * 展示：当前季度、上季度、去年同期季度
+     */
+    private List<AttendanceTrendDataDTO> generateQuarterlyTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+        // 获取当前用户所在站点ID
+        Long topSiteId = DeptUtils.getTopSiteId(deptService.selectDeptById(getDeptId()));
+        List<SysDept> stationAndThreeDepts = getBrigadesUnderSite(topSiteId);
+        stationAndThreeDepts.add(deptService.selectDeptById(topSiteId));
+        // 计算当前季度数据
+        List<AttendancePersonStatsDTO> currentList = calculateDeptStats(stationAndThreeDepts, params);
+
+        // 计算上季度数据
+        IndicatorCalculationParams lastQuarterParams = createLastQuarterParams(params);
+        List<AttendancePersonStatsDTO> lastQuarterList = calculateDeptStats(stationAndThreeDepts, lastQuarterParams);
+
+        // 计算去年同期季度数据
+        IndicatorCalculationParams lastYearParams = createLastYearParams(params);
+        List<AttendancePersonStatsDTO> lastYearList = calculateDeptStats(stationAndThreeDepts, lastYearParams);
+
+        // 构造柱状图数据
+        AttendanceTrendDataDTO currentData = createTrendDataPoint(getQuarterLabel(params), currentList);
+        AttendanceTrendDataDTO lastQuarterData = createTrendDataPoint(getLastQuarterLabel(params), lastQuarterList);
+        AttendanceTrendDataDTO lastYearData = createTrendDataPoint(getLastYearQuarterLabel(params), lastYearList);
+
+        results.add(lastYearData);
+        results.add(lastQuarterData);
+        results.add(currentData);
+        return results;
+    }
+
+    /**
+     * 生成年度趋势数据（仅同比）
+     * 展示：当前年、去年
+     */
+    private List<AttendanceTrendDataDTO> generateYearlyTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+        // 获取当前用户所在站点ID
+        Long topSiteId = DeptUtils.getTopSiteId(deptService.selectDeptById(getDeptId()));
+        List<SysDept> stationAndThreeDepts = getBrigadesUnderSite(topSiteId);
+        stationAndThreeDepts.add(deptService.selectDeptById(topSiteId));
+        // 计算当前年数据
+        List<AttendancePersonStatsDTO> currentList = calculateDeptStats(stationAndThreeDepts, params);
+
+        // 计算去年数据
+        IndicatorCalculationParams lastYearParams = createLastYearParams(params);
+        List<AttendancePersonStatsDTO> lastYearList = calculateDeptStats(stationAndThreeDepts, lastYearParams);
+
+        // 构造柱状图数据
+        AttendanceTrendDataDTO currentData = createTrendDataPoint(params.getYear() + "年", currentList);
+        AttendanceTrendDataDTO lastYearData = createTrendDataPoint((params.getYear() - 1) + "年", lastYearList);
+        results.add(lastYearData);
+        results.add(currentData);
+
+
+        return results;
+    }
+
+    /**
+     * 计算部门统计数据
+     */
+    private List<AttendancePersonStatsDTO> calculateDeptStats(List<SysDept> depts, IndicatorCalculationParams params) {
+        List<AttendancePersonStatsDTO> results = new ArrayList<>();
+        depts.forEach(dept -> {
+            results.add(createAttendancePersonStats(dept, params));
+        });
+        return results;
+    }
+
+    /**
+     * 创建趋势数据点
+     */
+    private AttendanceTrendDataDTO createTrendDataPoint(String timeLabel, List<AttendancePersonStatsDTO> dataList) {
+        AttendanceTrendDataDTO data = new AttendanceTrendDataDTO();
+        data.setTimeLabel(timeLabel);
+        data.setOverall(getStationValue(dataList));
+        data.setData1(getDeptValue(dataList, "安检一大队"));
+        data.setData2(getDeptValue(dataList, "安检二大队"));
+        data.setData3(getDeptValue(dataList, "安检三大队"));
+        data.setData4(getDeptValue(dataList, "安检综合大队"));
+        return data;
+    }
+
+    /**
+     * 获取季度标签
+     */
+    private String getQuarterLabel(IndicatorCalculationParams params) {
+        if (params.getYear() != null && params.getQuarter() != null) {
+            return params.getYear() + "年第" + params.getQuarter() + "季度";
+        }
+        return "当前季度";
+    }
+
+    /**
+     * 获取上季度标签
+     */
+    private String getLastQuarterLabel(IndicatorCalculationParams params) {
+        if (params.getYear() != null && params.getQuarter() != null) {
+            int lastQuarter = params.getQuarter() - 1;
+            int year = params.getYear();
+            if (lastQuarter <= 0) {
+                lastQuarter = 4;
+                year = year - 1;
+            }
+            return year + "年第" + lastQuarter + "季度";
+        }
+        return "上季度";
+    }
+
+    /**
+     * 获取去年季度标签
+     */
+    private String getLastYearQuarterLabel(IndicatorCalculationParams params) {
+        if (params.getYear() != null && params.getQuarter() != null) {
+            return (params.getYear() - 1) + "年第" + params.getQuarter() + "季度";
+        }
+        return "去年同期季度";
+    }
+
+    /**
+     * 月度标签
+     */
+    private String getMonthLabel(IndicatorCalculationParams params) {
+        if (params.getYear() != null && params.getMonth() != null) {
+            return params.getYear() + "年" + params.getMonth() + "月";
+        }
+        return "当前月度";
+    }
+
+    /**
+     * 获取上月标签
+     */
+    private String getLastMonthLabel(IndicatorCalculationParams params) {
+        if (params.getYear() != null && params.getMonth() != null) {
+            int lastMonth = params.getMonth() - 1;
+            int year = params.getYear();
+            if (lastMonth <= 0) {
+                lastMonth = 12;
+                year = year - 1;
+            }
+            return year + "年" + lastMonth + "月";
+        }
+        return "上月";
+    }
+
+    /**
+     * 获取去年本月度标签
+     */
+    private String getLastYearMonthLabel(IndicatorCalculationParams params) {
+        if (params.getYear() != null && params.getMonth() != null) {
+            return (params.getYear() - 1) + "年" + params.getMonth() + "月";
+        }
+        return "去年同期月度";
+    }
+
+
+    /**
+     * 创建出勤人次统计对象（根据部门实体）
+     */
+    private AttendancePersonStatsDTO createAttendancePersonStats(SysDept sysDept, IndicatorCalculationParams params) {
+        AttendancePersonStatsDTO result = new AttendancePersonStatsDTO();
+        result.setDeptId(sysDept.getDeptId());
+        result.setDeptName(sysDept.getDeptName());
+        result.setDeptType(sysDept.getDeptType());
+        try {
+            IndicatorCalculationParams calcParams = new IndicatorCalculationParams();
+            calcParams.setDeptId(sysDept.getDeptId());
+            calcParams.setYear(params.getYear());
+            calcParams.setQuarter(params.getQuarter());
+            calcParams.setMonth(params.getMonth());
+            calcParams.setStartTime(params.getStartTime());
+            calcParams.setEndTime(params.getEndTime());
+            calcParams.setChainRatio(params.getChainRatio());
+            calcParams.setYearOnYear(params.getYearOnYear());
+
+            IndicatorCalculationResult currentResult;
+            if (sysDept.getDeptType().equals(DeptTypeEnum.STATION.getCode())) {
+                currentResult = multiModelIndicatorCalculator.calculateWithRatio(overallCalculator, calcParams);
+            } else {
+                currentResult = multiModelIndicatorCalculator.calculateWithRatio(deptCalculator, calcParams);
+            }
+
+            if ("SUCCESS".equals(currentResult.getStatus())) {
+                result.setCurrentValue(currentResult.getValue());
+                result.setBaselineValue(currentResult.getBaselineValue());
+
+                boolean showChainRatio = params.getChainRatio() != null && params.getChainRatio();
+                boolean showYearOnYear = params.getYearOnYear() != null && params.getYearOnYear();
+
+                if (params.getYear() != null && params.getQuarter() == null && params.getMonth() == null) {
+                    showChainRatio = false;
+                }
+
+                if (showYearOnYear && currentResult.getYearOnYearValue() != null) {
+                    result.setYearOnYearValue(currentResult.getYearOnYearValue());
+                    result.setYearOnYearDirection(getDirectionText(currentResult.getYearOnYearValue()));
+                    result.setYearOnYearTimeDimension((TimeDimensionParams) currentResult.getExtraInfo().get("yearOnYear"));
+                }
+
+                if (showChainRatio && currentResult.getChainRatioValue() != null) {
+                    result.setChainRatioValue(currentResult.getChainRatioValue());
+                    result.setChainRatioDirection(getDirectionText(currentResult.getChainRatioValue()));
+                    result.setChainTimeDimension((TimeDimensionParams) currentResult.getExtraInfo().get("chain"));
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return result;
+    }
+
+    /**
+     * 创建出勤人次统计对象（根据参数直接计算）
+     * 支持按部门、班组、个人进行统计
+     */
+    private AttendancePersonStatsDTO createAttendancePersonStatsForParams(IndicatorCalculationParams params) {
+        AttendancePersonStatsDTO result = new AttendancePersonStatsDTO();
+
+        // 设置部门信息
+        if (params.getDeptId() != null) {
+            SysDept dept = deptService.selectDeptById(params.getDeptId());
+            if (dept != null) {
+                result.setDeptId(dept.getDeptId());
+                result.setDeptName(dept.getDeptName());
+                result.setDeptType(dept.getDeptType());
+            }
+        }
+
+        try {
+            IndicatorCalculationResult currentResult = multiModelIndicatorCalculator.calculateWithRatio(deptCalculator, params);
+
+            if ("SUCCESS".equals(currentResult.getStatus())) {
+                result.setCurrentValue(currentResult.getValue());
+                result.setBaselineValue(currentResult.getBaselineValue());
+
+                boolean showChainRatio = params.getChainRatio() != null && params.getChainRatio();
+                boolean showYearOnYear = params.getYearOnYear() != null && params.getYearOnYear();
+
+                if (params.getYear() != null && params.getQuarter() == null && params.getMonth() == null) {
+                    showChainRatio = false;
+                }
+
+                if (showYearOnYear && currentResult.getYearOnYearValue() != null) {
+                    result.setYearOnYearValue(currentResult.getYearOnYearValue());
+                    result.setYearOnYearDirection(getDirectionText(currentResult.getYearOnYearValue()));
+                    result.setYearOnYearTimeDimension((TimeDimensionParams) currentResult.getExtraInfo().get("yearOnYear"));
+                }
+
+                if (showChainRatio && currentResult.getChainRatioValue() != null) {
+                    result.setChainRatioValue(currentResult.getChainRatioValue());
+                    result.setChainRatioDirection(getDirectionText(currentResult.getChainRatioValue()));
+                    result.setChainTimeDimension((TimeDimensionParams) currentResult.getExtraInfo().get("chain"));
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return result;
+    }
+
+    /**
+     * 创建上月参数
+     */
+    private IndicatorCalculationParams createLastMonthParams(IndicatorCalculationParams originalParams) {
+        IndicatorCalculationParams params = new IndicatorCalculationParams();
+        params.setYear(originalParams.getYear());
+        params.setQuarter(originalParams.getQuarter());
+        params.setMonth(originalParams.getMonth());
+        params.setStartTime(originalParams.getStartTime());
+        params.setEndTime(originalParams.getEndTime());
+        params.setUserId(originalParams.getUserId());
+        params.setDeptId(originalParams.getDeptId());
+        params.setChainRatio(false);
+        params.setYearOnYear(false);
+
+        // 计算上月
+        if (params.getMonth() != null) {
+            int lastMonth = params.getMonth() - 1;
+            int year = params.getYear();
+            if (lastMonth <= 0) {
+                lastMonth = 12;
+                year = year - 1;
+            }
+            params.setMonth(lastMonth);
+            params.setYear(year);
+        }
+
+        return params;
+    }
+
+    /**
+     * 创建上季度参数
+     */
+    private IndicatorCalculationParams createLastQuarterParams(IndicatorCalculationParams originalParams) {
+        IndicatorCalculationParams params = new IndicatorCalculationParams();
+        params.setYear(originalParams.getYear());
+        params.setQuarter(originalParams.getQuarter());
+        params.setMonth(originalParams.getMonth());
+        params.setStartTime(originalParams.getStartTime());
+        params.setEndTime(originalParams.getEndTime());
+        params.setUserId(originalParams.getUserId());
+        params.setDeptId(originalParams.getDeptId());
+        params.setChainRatio(false);
+        params.setYearOnYear(false);
+
+        // 计算上季度
+        if (params.getQuarter() != null) {
+            int lastQuarter = params.getQuarter() - 1;
+            int year = params.getYear();
+            if (lastQuarter <= 0) {
+                lastQuarter = 4;
+                year = year - 1;
+            }
+            params.setQuarter(lastQuarter);
+            params.setYear(year);
+        }
+
+        return params;
+    }
+
+
+    /**
+     * 创建去年同期参数
+     */
+    private IndicatorCalculationParams createLastYearParams(IndicatorCalculationParams originalParams) {
+        IndicatorCalculationParams params = new IndicatorCalculationParams();
+        params.setYear(originalParams.getYear());
+        params.setQuarter(originalParams.getQuarter());
+        params.setMonth(originalParams.getMonth());
+        params.setStartTime(originalParams.getStartTime());
+        params.setEndTime(originalParams.getEndTime());
+        params.setUserId(originalParams.getUserId());
+        params.setDeptId(originalParams.getDeptId());
+        params.setChainRatio(false);
+        params.setYearOnYear(false);
+
+        // 计算去年同期
+        if (params.getYear() != null) {
+            params.setYear(params.getYear() - 1);
+        }
+
+        return params;
+    }
+
+    /**
+     * 获取站点值
+     */
+    private BigDecimal getStationValue(List<AttendancePersonStatsDTO> list) {
+        return list.stream()
+                .filter(dto -> DeptTypeEnum.STATION.getCode().equals(dto.getDeptType()))
+                .findFirst()
+                .map(AttendancePersonStatsDTO::getCurrentValue)
+                .orElse(BigDecimal.ZERO);
+    }
+
+    /**
+     * 获取指定大队的值
+     */
+    private BigDecimal getDeptValue(List<AttendancePersonStatsDTO> list, String deptName) {
+        return list.stream()
+                .filter(dto -> DeptTypeEnum.BRIGADE.getCode().equals(dto.getDeptType())
+                        && deptName.equals(dto.getDeptName()))
+                .findFirst()
+                .map(AttendancePersonStatsDTO::getCurrentValue)
+                .orElse(BigDecimal.ZERO);
+    }
+
+    /**
+     * 获取方向文本：上升 或 下降
+     */
+    private String getDirectionText(String growthRate) {
+        if (StringUtils.isEmpty(growthRate)) return "";
+        if (growthRate.equals("--")) return "上升";
+        return new BigDecimal(growthRate).compareTo(BigDecimal.ZERO) >= 0 ? "上升" : "下降";
+    }
+
+
+    /**
+     * 获取站点下的所有大队
+     */
+    private List<SysDept> getBrigadesUnderSite(Long siteId) {
+        List<SysDept> children = deptService.selectChildrenDeptById(siteId);
+        return children.stream()
+                .filter(dept -> DeptTypeEnum.BRIGADE.getCode().equals(dept.getDeptType()))
+                .collect(Collectors.toList());
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BaseAttachmentController.java

@@ -0,0 +1,100 @@
+package com.sundot.airport.web.controller.system;
+
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.domain.BaseAttachment;
+import com.sundot.airport.common.service.IBaseAttachmentService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 附件Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-14
+ */
+@RestController
+@RequestMapping("/system/attachment")
+public class BaseAttachmentController extends BaseController {
+    @Autowired
+    private IBaseAttachmentService baseAttachmentService;
+
+    /**
+     * 查询附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BaseAttachment baseAttachment) {
+        startPage();
+        List<BaseAttachment> list = baseAttachmentService.selectBaseAttachmentList(baseAttachment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:export')")
+    @Log(title = "附件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BaseAttachment baseAttachment) {
+        List<BaseAttachment> list = baseAttachmentService.selectBaseAttachmentList(baseAttachment);
+        ExcelUtil<BaseAttachment> util = new ExcelUtil<BaseAttachment>(BaseAttachment.class);
+        util.exportExcel(response, list, "附件数据");
+    }
+
+    /**
+     * 获取附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(baseAttachmentService.selectBaseAttachmentById(id));
+    }
+
+    /**
+     * 新增附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:add')")
+    @Log(title = "附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BaseAttachment baseAttachment) {
+        baseAttachment.setCreateBy(getUsername());
+        return toAjax(baseAttachmentService.insertBaseAttachment(baseAttachment));
+    }
+
+    /**
+     * 修改附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:edit')")
+    @Log(title = "附件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BaseAttachment baseAttachment) {
+        baseAttachment.setUpdateBy(getUsername());
+        return toAjax(baseAttachmentService.updateBaseAttachment(baseAttachment));
+    }
+
+    /**
+     * 删除附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:attachment:remove')")
+    @Log(title = "附件", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(baseAttachmentService.deleteBaseAttachmentByIds(ids));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BaseCheckCategoryController.java

@@ -0,0 +1,108 @@
+package com.sundot.airport.web.controller.system;
+
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.BaseCheckCategory;
+import com.sundot.airport.system.service.IBaseCheckCategoryService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+
+/**
+ * 检查项分类Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-11
+ */
+@RestController
+@RequestMapping("/system/checkCategory")
+public class BaseCheckCategoryController extends BaseController {
+    @Autowired
+    private IBaseCheckCategoryService baseCheckCategoryService;
+
+    /**
+     * 查询检查项分类列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:checkCategory:list')")
+    @GetMapping("/list")
+    public AjaxResult list(BaseCheckCategory baseCheckCategory) {
+        List<BaseCheckCategory> list = baseCheckCategoryService.selectBaseCheckCategoryList(baseCheckCategory);
+        return success(list);
+    }
+
+    /**
+     * 导出检查项分类列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:checkCategory:export')")
+    @Log(title = "检查项分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BaseCheckCategory baseCheckCategory) {
+        List<BaseCheckCategory> list = baseCheckCategoryService.selectBaseCheckCategoryList(baseCheckCategory);
+        ExcelUtil<BaseCheckCategory> util = new ExcelUtil<BaseCheckCategory>(BaseCheckCategory.class);
+        util.exportExcel(response, list, "检查项分类数据");
+    }
+
+    /**
+     * 获取检查项分类详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:checkCategory:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(baseCheckCategoryService.selectBaseCheckCategoryById(id));
+    }
+
+    /**
+     * 新增检查项分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:checkCategory:add')")
+    @Log(title = "检查项分类", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BaseCheckCategory baseCheckCategory) {
+        baseCheckCategory.setCreateBy(getUsername());
+        return toAjax(baseCheckCategoryService.insertBaseCheckCategory(baseCheckCategory));
+    }
+
+    /**
+     * 修改检查项分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:checkCategory:edit')")
+    @Log(title = "检查项分类", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BaseCheckCategory baseCheckCategory) {
+        baseCheckCategory.setUpdateBy(getUsername());
+        return toAjax(baseCheckCategoryService.updateBaseCheckCategory(baseCheckCategory));
+    }
+
+    /**
+     * 删除检查项分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:checkCategory:remove')")
+    @Log(title = "检查项分类", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(baseCheckCategoryService.deleteBaseCheckCategoryByIds(ids));
+    }
+
+    /**
+     * 查询检查项分类列表树形结构
+     */
+    @PreAuthorize("@ss.hasPermi('system:checkCategory:list')")
+    @GetMapping("/listTree")
+    public AjaxResult listTree(BaseCheckCategory baseCheckCategory) {
+        List<BaseCheckCategory> list = baseCheckCategoryService.selectBaseCheckCategoryListTree(baseCheckCategory);
+        return success(list);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BaseCheckPointController.java

@@ -0,0 +1,108 @@
+package com.sundot.airport.web.controller.system;
+
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.BaseCheckPoint;
+import com.sundot.airport.system.service.IBaseCheckPointService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+
+/**
+ * 检查部位Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/system/point")
+public class BaseCheckPointController extends BaseController {
+    @Autowired
+    private IBaseCheckPointService baseCheckPointService;
+
+    /**
+     * 查询检查部位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:point:list')")
+    @GetMapping("/list")
+    public AjaxResult list(BaseCheckPoint baseCheckPoint) {
+        List<BaseCheckPoint> list = baseCheckPointService.selectBaseCheckPointList(baseCheckPoint);
+        return success(list);
+    }
+
+    /**
+     * 导出检查部位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:point:export')")
+    @Log(title = "检查部位", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BaseCheckPoint baseCheckPoint) {
+        List<BaseCheckPoint> list = baseCheckPointService.selectBaseCheckPointList(baseCheckPoint);
+        ExcelUtil<BaseCheckPoint> util = new ExcelUtil<BaseCheckPoint>(BaseCheckPoint.class);
+        util.exportExcel(response, list, "检查部位数据");
+    }
+
+    /**
+     * 获取检查部位详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:point:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(baseCheckPointService.selectBaseCheckPointById(id));
+    }
+
+    /**
+     * 新增检查部位
+     */
+    @PreAuthorize("@ss.hasPermi('system:point:add')")
+    @Log(title = "检查部位", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BaseCheckPoint baseCheckPoint) {
+        baseCheckPoint.setCreateBy(getUsername());
+        return toAjax(baseCheckPointService.insertBaseCheckPoint(baseCheckPoint));
+    }
+
+    /**
+     * 修改检查部位
+     */
+    @PreAuthorize("@ss.hasPermi('system:point:edit')")
+    @Log(title = "检查部位", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BaseCheckPoint baseCheckPoint) {
+        baseCheckPoint.setUpdateBy(getUsername());
+        return toAjax(baseCheckPointService.updateBaseCheckPoint(baseCheckPoint));
+    }
+
+    /**
+     * 删除检查部位
+     */
+    @PreAuthorize("@ss.hasPermi('system:point:remove')")
+    @Log(title = "检查部位", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(baseCheckPointService.deleteBaseCheckPointByIds(ids));
+    }
+
+    /**
+     * 查询检查部位列表树形结构
+     */
+    @PreAuthorize("@ss.hasPermi('system:point:list')")
+    @GetMapping("/listTree")
+    public AjaxResult listTree(BaseCheckPoint baseCheckPoint) {
+        List<BaseCheckPoint> list = baseCheckPointService.selectBaseCheckPointListTree(baseCheckPoint);
+        return success(list);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BaseDefaultChoiseController.java

@@ -0,0 +1,109 @@
+package com.sundot.airport.web.controller.system;
+
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.annotation.Anonymous;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.BaseDefaultChoise;
+import com.sundot.airport.system.service.IBaseDefaultChoiseService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 默认选择配置Controller
+ *
+ * @author ruoyi
+ * @date 2025-08-25
+ */
+@RestController
+@RequestMapping("/system/defaultChoise")
+public class BaseDefaultChoiseController extends BaseController {
+    @Autowired
+    private IBaseDefaultChoiseService baseDefaultChoiseService;
+
+    /**
+     * 查询默认选择配置列表
+     */
+    @Anonymous
+    @GetMapping("/list")
+    public TableDataInfo list(BaseDefaultChoise baseDefaultChoise) {
+        startPage();
+        List<BaseDefaultChoise> list = baseDefaultChoiseService.selectBaseDefaultChoiseList(baseDefaultChoise);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出默认选择配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:defaultChoise:export')")
+    @Log(title = "默认选择配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BaseDefaultChoise baseDefaultChoise) {
+        List<BaseDefaultChoise> list = baseDefaultChoiseService.selectBaseDefaultChoiseList(baseDefaultChoise);
+        ExcelUtil<BaseDefaultChoise> util = new ExcelUtil<BaseDefaultChoise>(BaseDefaultChoise.class);
+        util.exportExcel(response, list, "默认选择配置数据");
+    }
+
+    /**
+     * 获取默认选择配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:defaultChoise:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(baseDefaultChoiseService.selectBaseDefaultChoiseById(id));
+    }
+
+    /**
+     * 新增默认选择配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:defaultChoise:add')")
+    @Log(title = "默认选择配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BaseDefaultChoise baseDefaultChoise) {
+        return toAjax(baseDefaultChoiseService.insertBaseDefaultChoise(baseDefaultChoise));
+    }
+
+    /**
+     * 修改默认选择配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:defaultChoise:edit')")
+    @Log(title = "默认选择配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BaseDefaultChoise baseDefaultChoise) {
+        return toAjax(baseDefaultChoiseService.updateBaseDefaultChoise(baseDefaultChoise));
+    }
+
+    /**
+     * 删除默认选择配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:defaultChoise:remove')")
+    @Log(title = "默认选择配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(baseDefaultChoiseService.deleteBaseDefaultChoiseByIds(ids));
+    }
+
+    /**
+     * 获取默认选择的分类信息（包含ID、名称及父类信息）
+     */
+    @Anonymous
+    @GetMapping("/categoryInfo/{categoryType}")
+    public AjaxResult getCategoryInfo(@PathVariable("categoryType") Integer categoryType) {
+        List<BaseDefaultChoise> list = baseDefaultChoiseService.selectDefaultCategoryWithInfo(categoryType);
+        return success(list);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BasePositionController.java

@@ -0,0 +1,107 @@
+package com.sundot.airport.web.controller.system;
+
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.BasePosition;
+import com.sundot.airport.system.service.IBasePositionService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+
+/**
+ * 位置Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-09
+ */
+@RestController
+@RequestMapping("/system/position")
+public class BasePositionController extends BaseController {
+    @Autowired
+    private IBasePositionService basePositionService;
+
+    /**
+     * 查询位置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:position:list')")
+    @GetMapping("/list")
+    public AjaxResult list(BasePosition basePosition) {
+        List<BasePosition> list = basePositionService.selectBasePositionList(basePosition);
+        return success(list);
+    }
+
+    /**
+     * 导出位置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:position:export')")
+    @Log(title = "位置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasePosition basePosition) {
+        List<BasePosition> list = basePositionService.selectBasePositionList(basePosition);
+        ExcelUtil<BasePosition> util = new ExcelUtil<BasePosition>(BasePosition.class);
+        util.exportExcel(response, list, "位置数据");
+    }
+
+    /**
+     * 获取位置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:position:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(basePositionService.selectBasePositionById(id));
+    }
+
+    /**
+     * 新增位置
+     */
+    @PreAuthorize("@ss.hasPermi('system:position:add')")
+    @Log(title = "位置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BasePosition basePosition) {
+        basePosition.setCreateBy(getUsername());
+        return toAjax(basePositionService.insertBasePosition(basePosition));
+    }
+
+    /**
+     * 修改位置
+     */
+    @PreAuthorize("@ss.hasPermi('system:position:edit')")
+    @Log(title = "位置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BasePosition basePosition) {
+        basePosition.setUpdateBy(getUsername());
+        return toAjax(basePositionService.updateBasePosition(basePosition));
+    }
+
+    /**
+     * 删除位置
+     */
+    @PreAuthorize("@ss.hasPermi('system:position:remove')")
+    @Log(title = "位置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(basePositionService.deleteBasePositionByIds(ids));
+    }
+
+    /**
+     * 查询位置列表树形结构
+     */
+    @PreAuthorize("@ss.hasPermi('system:position:list')")
+    @GetMapping("/listTree")
+    public AjaxResult listTree(BasePosition basePosition) {
+        return success(basePositionService.selectBasePositionListTree(basePosition));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BaseProjectController.java

@@ -0,0 +1,194 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.collection.CollUtil;
+import com.sundot.airport.system.domain.vo.CheckProjectItemTreeVo;
+import com.sundot.airport.system.domain.vo.CheckProjectItemVo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.BaseProject;
+import com.sundot.airport.system.service.IBaseProjectService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 检查项目Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-11
+ */
+@RestController
+@RequestMapping("/system/project")
+public class BaseProjectController extends BaseController {
+    @Autowired
+    private IBaseProjectService baseProjectService;
+
+    /**
+     * 查询检查项目列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:project:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BaseProject baseProject) {
+        startPage();
+        List<BaseProject> list = baseProjectService.selectBaseProjectList(baseProject);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出检查项目列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:project:export')")
+    @Log(title = "检查项目", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BaseProject baseProject) {
+        List<BaseProject> list = baseProjectService.selectBaseProjectList(baseProject);
+        ExcelUtil<BaseProject> util = new ExcelUtil<BaseProject>(BaseProject.class);
+        util.exportExcel(response, list, "检查项目数据");
+    }
+
+    /**
+     * 获取检查项目详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:project:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(baseProjectService.selectBaseProjectById(id));
+    }
+
+    /**
+     * 新增检查项目
+     */
+    @PreAuthorize("@ss.hasPermi('system:project:add')")
+    @Log(title = "检查项目", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BaseProject baseProject) {
+        baseProject.setCreateBy(getUsername());
+        return toAjax(baseProjectService.insertBaseProject(baseProject));
+    }
+
+    /**
+     * 修改检查项目
+     */
+    @PreAuthorize("@ss.hasPermi('system:project:edit')")
+    @Log(title = "检查项目", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BaseProject baseProject) {
+        baseProject.setUpdateBy(getUsername());
+        return toAjax(baseProjectService.updateBaseProject(baseProject));
+    }
+
+    /**
+     * 删除检查项目
+     */
+    @PreAuthorize("@ss.hasPermi('system:project:remove')")
+    @Log(title = "检查项目", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(baseProjectService.deleteBaseProjectByIds(ids));
+    }
+
+    /**
+     * 根据分类编码查询检查项目列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:project:list')")
+    @GetMapping(value = "/list/{categoryCode}")
+    public AjaxResult list(@PathVariable("categoryCode") String categoryCode) {
+        return success(baseProjectService.selectProjectListByCategoryCode(categoryCode));
+    }
+
+    /**
+     * 根据检查级别查询检查项目列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:project:list')")
+    @GetMapping(value = "/listByCheckLevel/{checkLevel}")
+    public AjaxResult listByCheckedLevel(@PathVariable("checkLevel") String checkLevel) {
+        List<CheckProjectItemVo> result = baseProjectService.listByCheckLevel(checkLevel);
+        return success(convertToTree(result));
+    }
+
+    /**
+     * 转换为树形结构
+     */
+    public List<CheckProjectItemTreeVo> convertToTree(List<CheckProjectItemVo> itemList) {
+        if (CollUtil.isEmpty(itemList)) {
+            return Collections.emptyList();
+        }
+        List<CheckProjectItemTreeVo> result = new ArrayList<>();
+
+        // 第一层分组：按一级分类
+        Map<String, List<CheckProjectItemVo>> levelOneMap = itemList.stream()
+                .collect(Collectors.groupingBy(CheckProjectItemVo::getCategoryCodeOne));
+
+
+        // 处理一级分类
+        for (Map.Entry<String, List<CheckProjectItemVo>> levelOneEntry : levelOneMap.entrySet()) {
+            String levelOneCode = levelOneEntry.getKey();
+            List<CheckProjectItemVo> levelOneItems = levelOneEntry.getValue();
+
+            // 获取一级分类名称（取第一个元素的名称）
+            String levelOneName = levelOneItems.get(0).getCategoryNameOne();
+
+            // 创建一级节点
+            CheckProjectItemTreeVo levelOneNode = new CheckProjectItemTreeVo();
+            levelOneNode.setCode(levelOneCode);
+            levelOneNode.setName(levelOneName);
+
+            // 第二层分组：按二级分类
+            Map<String, List<CheckProjectItemVo>> levelTwoMap = levelOneItems.stream()
+                    .collect(Collectors.groupingBy(CheckProjectItemVo::getCategoryCodeTwo));
+
+            List<CheckProjectItemTreeVo> levelTwoNodes = new ArrayList<>();
+
+            // 处理二级分类
+            for (Map.Entry<String, List<CheckProjectItemVo>> levelTwoEntry : levelTwoMap.entrySet()) {
+                String levelTwoCode = levelTwoEntry.getKey();
+                List<CheckProjectItemVo> levelTwoItems = levelTwoEntry.getValue();
+
+                // 获取二级分类名称（取第一个元素的名称）
+                String levelTwoName = levelTwoItems.get(0).getCategoryNameTwo();
+
+                // 创建二级节点
+                CheckProjectItemTreeVo levelTwoNode = new CheckProjectItemTreeVo();
+                levelTwoNode.setCode(levelTwoCode);
+                levelTwoNode.setName(levelTwoName);
+
+                // 处理检查项目
+                List<CheckProjectItemTreeVo> projectNodes = levelTwoItems.stream()
+                        .map(item -> {
+                            CheckProjectItemTreeVo projectNode = new CheckProjectItemTreeVo();
+                            projectNode.setCode(item.getProjectCode());
+                            projectNode.setName(item.getProjectName());
+                            projectNode.setList(null); // 项目没有子节点
+                            return projectNode;
+                        })
+                        .collect(Collectors.toList());
+
+                levelTwoNode.setList(projectNodes);
+                levelTwoNodes.add(levelTwoNode);
+            }
+
+            levelOneNode.setList(levelTwoNodes);
+            result.add(levelOneNode);
+        }
+        return result;
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BaseReadController.java

@@ -0,0 +1,100 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.common.domain.BaseRead;
+import com.sundot.airport.common.service.IBaseReadService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 已读Controller
+ *
+ * @author ruoyi
+ * @date 2025-09-09
+ */
+@RestController
+@RequestMapping("/system/read")
+public class BaseReadController extends BaseController {
+    @Autowired
+    private IBaseReadService baseReadService;
+
+    /**
+     * 查询已读列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:read:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BaseRead baseRead) {
+        startPage();
+        List<BaseRead> list = baseReadService.selectBaseReadList(baseRead);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出已读列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:read:export')")
+    @Log(title = "已读", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BaseRead baseRead) {
+        List<BaseRead> list = baseReadService.selectBaseReadList(baseRead);
+        ExcelUtil<BaseRead> util = new ExcelUtil<BaseRead>(BaseRead.class);
+        util.exportExcel(response, list, "已读数据");
+    }
+
+    /**
+     * 获取已读详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:read:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(baseReadService.selectBaseReadById(id));
+    }
+
+    /**
+     * 新增已读
+     */
+    @PreAuthorize("@ss.hasPermi('system:read:add')")
+    @Log(title = "已读", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BaseRead baseRead) {
+        baseRead.setCreateBy(getUsername());
+        return toAjax(baseReadService.insertBaseRead(baseRead));
+    }
+
+    /**
+     * 修改已读
+     */
+    @PreAuthorize("@ss.hasPermi('system:read:edit')")
+    @Log(title = "已读", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BaseRead baseRead) {
+        baseRead.setUpdateBy(getUsername());
+        return toAjax(baseReadService.updateBaseRead(baseRead));
+    }
+
+    /**
+     * 删除已读
+     */
+    @PreAuthorize("@ss.hasPermi('system:read:remove')")
+    @Log(title = "已读", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(baseReadService.deleteBaseReadByIds(ids));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BaseSeizeCategoryController.java

@@ -0,0 +1,109 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.common.annotation.Anonymous;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.BaseSeizeCategory;
+import com.sundot.airport.system.service.IBaseSeizeCategoryService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+
+/**
+ * 查获物品分类Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/system/category")
+public class BaseSeizeCategoryController extends BaseController {
+    @Autowired
+    private IBaseSeizeCategoryService baseSeizeCategoryService;
+
+    /**
+     * 查询查获物品分类列表
+     */
+    @Anonymous
+    @GetMapping("/list")
+    public AjaxResult list(BaseSeizeCategory baseSeizeCategory) {
+        List<BaseSeizeCategory> list = baseSeizeCategoryService.selectBaseSeizeCategoryList(baseSeizeCategory);
+        return success(list);
+    }
+
+    /**
+     * 导出查获物品分类列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:category:export')")
+    @Log(title = "查获物品分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BaseSeizeCategory baseSeizeCategory) {
+        List<BaseSeizeCategory> list = baseSeizeCategoryService.selectBaseSeizeCategoryList(baseSeizeCategory);
+        ExcelUtil<BaseSeizeCategory> util = new ExcelUtil<BaseSeizeCategory>(BaseSeizeCategory.class);
+        util.exportExcel(response, list, "查获物品分类数据");
+    }
+
+    /**
+     * 获取查获物品分类详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:category:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(baseSeizeCategoryService.selectBaseSeizeCategoryById(id));
+    }
+
+    /**
+     * 新增查获物品分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:category:add')")
+    @Log(title = "查获物品分类", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BaseSeizeCategory baseSeizeCategory) {
+        baseSeizeCategory.setCreateBy(getUsername());
+        return toAjax(baseSeizeCategoryService.insertBaseSeizeCategory(baseSeizeCategory));
+    }
+
+    /**
+     * 修改查获物品分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:category:edit')")
+    @Log(title = "查获物品分类", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BaseSeizeCategory baseSeizeCategory) {
+        baseSeizeCategory.setUpdateBy(getUsername());
+        return toAjax(baseSeizeCategoryService.updateBaseSeizeCategory(baseSeizeCategory));
+    }
+
+    /**
+     * 删除查获物品分类
+     */
+    @PreAuthorize("@ss.hasPermi('system:category:remove')")
+    @Log(title = "查获物品分类", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(baseSeizeCategoryService.deleteBaseSeizeCategoryByIds(ids));
+    }
+
+    /**
+     * 查询查获物品分类列表树形结构
+     */
+    @PreAuthorize("@ss.hasPermi('system:category:list')")
+    @GetMapping("/listTree")
+    public AjaxResult listTree(BaseSeizeCategory baseSeizeCategory) {
+        List<BaseSeizeCategory> list = baseSeizeCategoryService.selectBaseSeizeCategoryListTree(baseSeizeCategory);
+        return success(list);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BaseSeizeItemController.java

@@ -0,0 +1,109 @@
+package com.sundot.airport.web.controller.system;
+
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.BaseSeizeItem;
+import com.sundot.airport.system.service.IBaseSeizeItemService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 查获物品Controller
+ *
+ * @author ruoyi
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/system/item")
+public class BaseSeizeItemController extends BaseController {
+    @Autowired
+    private IBaseSeizeItemService baseSeizeItemService;
+
+    /**
+     * 查询查获物品列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BaseSeizeItem baseSeizeItem) {
+        startPage();
+        List<BaseSeizeItem> list = baseSeizeItemService.selectBaseSeizeItemList(baseSeizeItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出查获物品列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:export')")
+    @Log(title = "查获物品", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BaseSeizeItem baseSeizeItem) {
+        List<BaseSeizeItem> list = baseSeizeItemService.selectBaseSeizeItemList(baseSeizeItem);
+        ExcelUtil<BaseSeizeItem> util = new ExcelUtil<BaseSeizeItem>(BaseSeizeItem.class);
+        util.exportExcel(response, list, "查获物品数据");
+    }
+
+    /**
+     * 获取查获物品详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(baseSeizeItemService.selectBaseSeizeItemById(id));
+    }
+
+    /**
+     * 新增查获物品
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:add')")
+    @Log(title = "查获物品", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BaseSeizeItem baseSeizeItem) {
+        baseSeizeItem.setCreateBy(getUsername());
+        return toAjax(baseSeizeItemService.insertBaseSeizeItem(baseSeizeItem));
+    }
+
+    /**
+     * 修改查获物品
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:edit')")
+    @Log(title = "查获物品", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BaseSeizeItem baseSeizeItem) {
+        baseSeizeItem.setUpdateBy(getUsername());
+        return toAjax(baseSeizeItemService.updateBaseSeizeItem(baseSeizeItem));
+    }
+
+    /**
+     * 删除查获物品
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:remove')")
+    @Log(title = "查获物品", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(baseSeizeItemService.deleteBaseSeizeItemByIds(ids));
+    }
+
+    /**
+     * 根据分类编码查询查获物品列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:list')")
+    @GetMapping(value = "/list/{categoryCode}")
+    public AjaxResult list(@PathVariable("categoryCode") String categoryCode) {
+        return success(baseSeizeItemService.selectSeizeItemListByCategoryCode(categoryCode));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SmsController.java

@@ -0,0 +1,54 @@
+package com.sundot.airport.web.controller.system;
+
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.service.SmsService;
+import com.sundot.airport.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 短信验证码控制器
+ *
+ * @author wangxx
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sms")
+@Api(tags = "短信验证码管理")
+public class SmsController {
+
+    @Autowired
+    private SmsService smsService;
+
+    /**
+     * 发送短信验证码
+     *
+     * @param phoneNumber 手机号码
+     * @return 结果
+     */
+    @PostMapping("/code")
+    @ApiOperation("发送短信验证码")
+    public AjaxResult sendSmsCode(@RequestParam String phoneNumber) {
+        if (StringUtils.isEmpty(phoneNumber)) {
+            return AjaxResult.error("手机号码不能为空");
+        }
+
+        try {
+            boolean result = smsService.sendSmsCode(phoneNumber);
+            if (result) {
+                return AjaxResult.success("验证码发送成功，请注意查收短信");
+            } else {
+                return AjaxResult.error("验证码发送失败");
+            }
+        } catch (Exception e) {
+            log.error("发送短信验证码异常：{}", e.getMessage(), e);
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysAppController.java

@@ -0,0 +1,132 @@
+package com.sundot.airport.web.controller.system;
+
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.SysApp;
+import com.sundot.airport.system.service.ISysAppService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 应用Controller
+ *
+ * @author ruoyi
+ * @date 2025-11-20
+ */
+@RestController
+@RequestMapping("/system/app")
+public class SysAppController extends BaseController {
+    @Autowired
+    private ISysAppService sysAppService;
+
+    /**
+     * 查询应用列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:app:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysApp sysApp) {
+        startPage();
+        List<SysApp> list = sysAppService.selectSysAppList(sysApp);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出应用列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:app:export')")
+    @Log(title = "应用", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysApp sysApp) {
+        List<SysApp> list = sysAppService.selectSysAppList(sysApp);
+        ExcelUtil<SysApp> util = new ExcelUtil<SysApp>(SysApp.class);
+        util.exportExcel(response, list, "应用数据");
+    }
+
+    /**
+     * 获取应用详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:app:query')")
+    @GetMapping(value = "/{appId}")
+    public AjaxResult getInfo(@PathVariable("appId") Long appId) {
+        return success(sysAppService.selectSysAppByAppId(appId));
+    }
+
+    /**
+     * 新增应用
+     */
+    @PreAuthorize("@ss.hasPermi('system:app:add')")
+    @Log(title = "应用", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysApp sysApp) {
+        sysApp.setCreateByUserId(getUserId());
+        sysApp.setCreateBy(getLoginUser().getUser().getNickName());
+        return toAjax(sysAppService.insertSysApp(sysApp));
+    }
+
+    /**
+     * 修改应用
+     */
+    @PreAuthorize("@ss.hasPermi('system:app:edit')")
+    @Log(title = "应用", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysApp sysApp) {
+        sysApp.setUpdateByUserId(getUserId());
+        sysApp.setUpdateBy(getLoginUser().getUser().getNickName());
+        return toAjax(sysAppService.updateSysApp(sysApp));
+    }
+
+    /**
+     * 删除应用
+     */
+    @PreAuthorize("@ss.hasPermi('system:app:remove')")
+    @Log(title = "应用", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{appIds}")
+    public AjaxResult remove(@PathVariable Long[] appIds) {
+        return toAjax(sysAppService.deleteSysAppByAppIds(appIds));
+    }
+
+    /**
+     * 查询全部应用列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:app:list')")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(SysApp sysApp) {
+        List<SysApp> list = sysAppService.selectSysAppList(sysApp);
+        return success(list);
+    }
+
+    /**
+     * 移动端查询全部应用列表
+     * homePage:0-非首页应用;1-首页应用
+     */
+//    @PreAuthorize("@ss.hasPermi('system:app:list')")
+    @GetMapping("/listBy")
+    public AjaxResult listBy(SysApp sysApp) {
+        List<SysApp> list = sysAppService.listBy(sysApp);
+        return success(list);
+    }
+
+    /**
+     * 根据角色ID查询应用列表
+     */
+    @GetMapping(value = "/roleAppSelect/{roleId}")
+    public AjaxResult roleAppSelect(@PathVariable("roleId") Long roleId) {
+        AjaxResult result = sysAppService.roleAppSelect(roleId);
+        return result;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysCheckAnalysisReportController.java

@@ -0,0 +1,68 @@
+package com.sundot.airport.web.controller.system;
+
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.check.service.ICheckLargeScreenService;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.SysAnalysisReportDateRangeDto;
+import com.sundot.airport.common.core.domain.SysAnalysisReportParamDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemDistributionDto;
+import com.sundot.airport.common.core.domain.SysCheckAnalysisReportDto;
+import com.sundot.airport.common.enums.DateRangeQueryTypeEnum;
+import com.sundot.airport.common.utils.DateRangeQueryUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 质控分析报告
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/analysisReport")
+public class SysCheckAnalysisReportController extends BaseController {
+
+    @Autowired
+    private ICheckLargeScreenService checkLargeScreenService;
+
+    /**
+     * 质控活动
+     */
+    @PostMapping("/check")
+    public AjaxResult checkAnalysisReport(@RequestBody SysAnalysisReportParamDto paramDto) {
+        List<SysAnalysisReportDateRangeDto> dateRangeList = new ArrayList<>();
+        if (StrUtil.equals(DateRangeQueryTypeEnum.YEAR.getCode(), paramDto.getDateRangeQueryType())) {
+            dateRangeList.add(DateRangeQueryUtils.getPreviousYearRange(paramDto.getYear()));
+            dateRangeList.add(DateRangeQueryUtils.getYearRange(paramDto.getYear(), null));
+        } else if (StrUtil.equals(DateRangeQueryTypeEnum.QUARTER.getCode(), paramDto.getDateRangeQueryType())) {
+            dateRangeList.add(DateRangeQueryUtils.getLastYearSameQuarterRange(paramDto.getYear(), paramDto.getQuarter()));
+            dateRangeList.add(DateRangeQueryUtils.getPreviousQuarterRange(paramDto.getYear(), paramDto.getQuarter()));
+            dateRangeList.add(DateRangeQueryUtils.getQuarterRange(paramDto.getYear(), paramDto.getQuarter(), null));
+        } else if (StrUtil.equals(DateRangeQueryTypeEnum.MONTH.getCode(), paramDto.getDateRangeQueryType())) {
+            dateRangeList.add(DateRangeQueryUtils.getLastYearSameMonthRange(paramDto.getYear(), paramDto.getMonth()));
+            dateRangeList.add(DateRangeQueryUtils.getPreviousMonthRange(paramDto.getYear(), paramDto.getMonth()));
+            dateRangeList.add(DateRangeQueryUtils.getMonthRange(paramDto.getYear(), paramDto.getMonth(), null));
+        }
+        paramDto.setDateRangeList(dateRangeList);
+        SysCheckAnalysisReportDto result = checkLargeScreenService.checkAnalysisReport(paramDto);
+        return success(result);
+    }
+
+    /**
+     * 质控活动-问题分布统计
+     */
+    @GetMapping("/checkProblemDistribution")
+    public AjaxResult checkAnalysisReportCheckProblemDistributionDto(BaseLargeScreenQueryParamDto paramDto) {
+        SysCheckAnalysisReportCheckProblemDistributionDto result = checkLargeScreenService.getCheckProblemDistribution(paramDto);
+        return success(result);
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysConfigController.java

@@ -0,0 +1,133 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.system.domain.SysConfig;
+import com.sundot.airport.system.service.ISysConfigService;
+
+/**
+ * 参数配置 信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/config")
+public class SysConfigController extends BaseController
+{
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysConfig config)
+    {
+        startPage();
+        List<SysConfig> list = configService.selectConfigList(config);
+        return getDataTable(list);
+    }
+
+    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysConfig config)
+    {
+        List<SysConfig> list = configService.selectConfigList(config);
+        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+        util.exportExcel(response, list, "参数数据");
+    }
+
+    /**
+     * 根据参数编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @GetMapping(value = "/{configId}")
+    public AjaxResult getInfo(@PathVariable Long configId)
+    {
+        return success(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     */
+    @GetMapping(value = "/configKey/{configKey}")
+    public AjaxResult getConfigKey(@PathVariable String configKey)
+    {
+        return success(configService.selectConfigByKey(configKey));
+    }
+
+    /**
+     * 新增参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysConfig config)
+    {
+        if (!configService.checkConfigKeyUnique(config))
+        {
+            return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        config.setCreateBy(getUsername());
+        return toAjax(configService.insertConfig(config));
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysConfig config)
+    {
+        if (!configService.checkConfigKeyUnique(config))
+        {
+            return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        config.setUpdateBy(getUsername());
+        return toAjax(configService.updateConfig(config));
+    }
+
+    /**
+     * 删除参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public AjaxResult remove(@PathVariable Long[] configIds)
+    {
+        configService.deleteConfigByIds(configIds);
+        return success();
+    }
+
+    /**
+     * 刷新参数缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        configService.resetConfigCache();
+        return success();
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysDeptController.java

@@ -0,0 +1,162 @@
+package com.sundot.airport.web.controller.system;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.constant.UserConstants;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.system.service.ISysDeptService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 部门信息
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dept")
+public class SysDeptController extends BaseController {
+    @Autowired
+    private ISysDeptService deptService;
+
+    /**
+     * 获取部门列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list")
+    public AjaxResult list(SysDept dept) {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return success(depts);
+    }
+
+    /**
+     * 查询部门列表（排除节点）
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list/exclude/{deptId}")
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
+        return success(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    @GetMapping(value = "/{deptId}")
+    public AjaxResult getInfo(@PathVariable Long deptId) {
+        deptService.checkDeptDataScope(deptId);
+        return success(deptService.selectDeptById(deptId));
+    }
+
+    /**
+     * 新增部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDept dept) {
+        if (!deptService.checkDeptNameUnique(dept)) {
+            return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        dept.setCreateBy(getUsername());
+        return toAjax(deptService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDept dept) {
+        Long deptId = dept.getDeptId();
+        deptService.checkDeptDataScope(deptId);
+        if (!deptService.checkDeptNameUnique(dept)) {
+            return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        } else if (dept.getParentId().equals(deptId)) {
+            return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) {
+            return error("该部门包含未停用的子部门！");
+        }
+        dept.setUpdateBy(getUsername());
+        return toAjax(deptService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deptId}")
+    public AjaxResult remove(@PathVariable Long deptId) {
+        if (deptService.hasChildByDeptId(deptId)) {
+            return warn("存在下级部门,不允许删除");
+        }
+        if (deptService.checkDeptExistUser(deptId)) {
+            return warn("部门存在用户,不允许删除");
+        }
+        deptService.checkDeptDataScope(deptId);
+        return toAjax(deptService.deleteDeptById(deptId));
+    }
+
+    @PostMapping("/teamList")
+    public AjaxResult teamList(@RequestBody SysDept dept) {
+        return success(buildTree(deptService.selectDeptInfoAll(dept)));
+    }
+
+    private Map<String, String> buildTree(List<SysDept> list) {
+        Map<String, String> result = new HashMap<>();
+        // 从班组开始往上推，最多3级
+        List<SysDept> teams = list.stream().filter(x -> StrUtil.equals(x.getDeptType(), DeptTypeEnum.TEAMS.getCode())).collect(Collectors.toList());
+        if (CollectionUtil.isEmpty(teams)) {
+            return result;
+        }
+        teams.forEach(team -> {
+            String val = team.getDeptId().toString();
+            StringBuffer label = new StringBuffer(team.getDeptName());
+            if (StrUtil.isNotBlank(team.getAncestors())) {
+                String[] splits = team.getAncestors().split(",");
+                // splits 去掉 第一个元素，并且反转
+                List<String> reverse = Arrays.stream(splits).skip(1).collect(Collectors.toList());
+                // reverse 元素反转
+                Collections.reverse(reverse);
+                reverse.forEach(parent -> {
+                    SysDept department = list.stream().filter(x -> StrUtil.equals(parent, x.getDeptId().toString())).findFirst().orElse(new SysDept());
+                    label.insert(0, department.getDeptName() + "/");
+                });
+            }
+            result.put(val, label.toString());
+        });
+        return result;
+    }
+
+    /**
+     * 查询部门负责人
+     */
+    @GetMapping(value = "/deptLeader/{deptId}")
+    public AjaxResult deptLeader(@PathVariable Long deptId) {
+        return success(deptService.deptLeader(deptId));
+    }
+
+    /**
+     * 查询部门指定角色人员
+     */
+    @PostMapping(value = "/deptRole/{deptId}")
+    public AjaxResult deptRole(@PathVariable Long deptId, @RequestBody List<String> roleKeyList) {
+        return success(deptService.deptRole(deptId, roleKeyList));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysDictDataController.java

@@ -0,0 +1,121 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysDictData;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.system.service.ISysDictDataService;
+import com.sundot.airport.system.service.ISysDictTypeService;
+
+/**
+ * 数据字典信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dict/data")
+public class SysDictDataController extends BaseController
+{
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictData dictData)
+    {
+        startPage();
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return getDataTable(list);
+    }
+
+    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDictData dictData)
+    {
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+        util.exportExcel(response, list, "字典数据");
+    }
+
+    /**
+     * 查询字典数据详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictCode}")
+    public AjaxResult getInfo(@PathVariable Long dictCode)
+    {
+        return success(dictDataService.selectDictDataById(dictCode));
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @GetMapping(value = "/type/{dictType}")
+    public AjaxResult dictType(@PathVariable String dictType)
+    {
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+        if (StringUtils.isNull(data))
+        {
+            data = new ArrayList<SysDictData>();
+        }
+        return success(data);
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setCreateBy(getUsername());
+        return toAjax(dictDataService.insertDictData(dict));
+    }
+
+    /**
+     * 修改保存字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setUpdateBy(getUsername());
+        return toAjax(dictDataService.updateDictData(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    public AjaxResult remove(@PathVariable Long[] dictCodes)
+    {
+        dictDataService.deleteDictDataByIds(dictCodes);
+        return success();
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysDictTypeController.java

@@ -0,0 +1,121 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysDictType;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.system.service.ISysDictTypeService;
+
+/**
+ * 数据字典信息
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dict/type")
+public class SysDictTypeController extends BaseController {
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictType dictType) {
+        startPage();
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        return getDataTable(list);
+    }
+
+    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDictType dictType) {
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+        util.exportExcel(response, list, "字典类型");
+    }
+
+    /**
+     * 查询字典类型详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictId}")
+    public AjaxResult getInfo(@PathVariable Long dictId) {
+        return success(dictTypeService.selectDictTypeById(dictId));
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictType dict) {
+        if (!dictTypeService.checkDictTypeUnique(dict)) {
+            return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dict.setCreateBy(getUsername());
+        return toAjax(dictTypeService.insertDictType(dict));
+    }
+
+    /**
+     * 修改字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictType dict) {
+        if (!dictTypeService.checkDictTypeUnique(dict)) {
+            return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dict.setUpdateBy(getUsername());
+        return toAjax(dictTypeService.updateDictType(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictIds}")
+    public AjaxResult remove(@PathVariable Long[] dictIds) {
+        dictTypeService.deleteDictTypeByIds(dictIds);
+        return success();
+    }
+
+    /**
+     * 刷新字典缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache() {
+        dictTypeService.resetDictCache();
+        return success();
+    }
+
+    /**
+     * 获取字典选择框列表
+     */
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect() {
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+        return success(dictTypes);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysDynamicSqlController.java

@@ -0,0 +1,93 @@
+package com.sundot.airport.web.controller.system;
+
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.system.domain.SysDynamicSql;
+import com.sundot.airport.system.service.ISysDynamicSqlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 动态sql执行configController
+ *
+ * @author ruoyi
+ * @date 2025-06-20
+ */
+@RestController
+@RequestMapping("/system/sql")
+public class SysDynamicSqlController extends BaseController {
+    @Autowired
+    private ISysDynamicSqlService sysDynamicSqlService;
+
+    /**
+     * 查询动态sql执行config列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SysDynamicSql sysDynamicSql) {
+        startPage();
+        List<SysDynamicSql> list = sysDynamicSqlService.selectSysDynamicSqlList(sysDynamicSql);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出动态sql执行config列表
+     */
+    @Log(title = "动态sql执行config", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDynamicSql sysDynamicSql) {
+        List<SysDynamicSql> list = sysDynamicSqlService.selectSysDynamicSqlList(sysDynamicSql);
+        ExcelUtil<SysDynamicSql> util = new ExcelUtil<SysDynamicSql>(SysDynamicSql.class);
+        util.exportExcel(response, list, "动态sql执行config数据");
+    }
+
+    /**
+     * 获取动态sql执行config详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(sysDynamicSqlService.selectSysDynamicSqlById(id));
+    }
+
+    /**
+     * 新增动态sql执行config
+     */
+    @Log(title = "动态sql执行config", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysDynamicSql sysDynamicSql) {
+        return toAjax(sysDynamicSqlService.insertSysDynamicSql(sysDynamicSql));
+    }
+
+    /**
+     * 修改动态sql执行config
+     */
+    @Log(title = "动态sql执行config", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysDynamicSql sysDynamicSql) {
+        return toAjax(sysDynamicSqlService.updateSysDynamicSql(sysDynamicSql));
+    }
+
+    /**
+     * 删除动态sql执行config
+     */
+    @Log(title = "动态sql执行config", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(sysDynamicSqlService.deleteSysDynamicSqlByIds(ids));
+    }
+
+    /**
+     * 删除动态sql执行config
+     */
+    @PostMapping("/executeSqlByKeyAndParam/{sqlKey}")
+    public AjaxResult executeSqlByKeyAndParam(@PathVariable(name = "sqlKey") String sqlkey, @RequestBody Map<String, Object> params) {
+        return success(sysDynamicSqlService.executeSqlByKeyAndParam(sqlkey, params));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysHomePageController.java

@@ -0,0 +1,563 @@
+package com.sundot.airport.web.controller.system;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.attendance.service.IAttendancePostRecordService;
+import com.sundot.airport.check.service.ICheckLargeScreenService;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.DataPermissionResult;
+import com.sundot.airport.common.core.domain.SysHomePageDetailDto;
+import com.sundot.airport.common.core.domain.SysHomePageDetailQueryParamDto;
+import com.sundot.airport.common.core.domain.SysHomePageRankingDto;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.enums.DataPermissionType;
+import com.sundot.airport.common.enums.DeptType;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.enums.HomePageQueryEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.enums.SourceTypeEnum;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.exam.service.IAccuracyStatisticsService;
+import com.sundot.airport.item.mapper.SeizureReportMapper;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysLearningGrowthService;
+import com.sundot.airport.system.service.ISysUserService;
+import com.sundot.airport.web.core.utils.DataPermissionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 首页
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/homePage")
+public class SysHomePageController extends BaseController {
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Autowired
+    private ICheckLargeScreenService checkLargeScreenService;
+
+    @Autowired
+    private ISysLearningGrowthService sysLearningGrowthService;
+
+    @Autowired
+    private SeizureReportMapper seizureReportMapper;
+
+    @Autowired
+    private IAttendancePostRecordService attendancePostRecordService;
+
+    @Autowired
+    private IAccuracyStatisticsService accuracyStatisticsService;
+
+    /**
+     * 首页-排名
+     */
+    @GetMapping("/homePageRanking")
+    public AjaxResult homePageRanking(BaseLargeScreenQueryParamDto dto) {
+        SysHomePageRankingDto result = new SysHomePageRankingDto();
+        result.setCheckLargeScreenHomePageRankingDto(checkLargeScreenService.checkRanking(dto));
+        result.setDailyTaskAccuracyRankingDto(accuracyStatisticsService.getAccuracyRanking(dto));
+        return success(result);
+    }
+
+    /**
+     * 首页-整体
+     */
+    @GetMapping("/homePageWhole")
+    public AjaxResult homePageWhole(BaseLargeScreenQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<SysHomePageDetailQueryParamDto> dtoList = new ArrayList<>();
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+            if (DataPermissionType.SELF == dataPermission.getPermissionType()) {
+                SysHomePageDetailQueryParamDto userDto = new SysHomePageDetailQueryParamDto();
+                userDto.setId(getUserId());
+                userDto.setName(getLoginUser().getUser().getNickName());
+                userDto.setType(HomePageQueryEnum.USER.getCode());
+                dtoList.add(userDto);
+                List<SysDept> deptList = deptService.selectAllDept(getDeptId());
+                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.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 (ObjectUtil.isNotNull(team)) {
+                    SysHomePageDetailQueryParamDto teamDto = new SysHomePageDetailQueryParamDto();
+                    teamDto.setId(team.getDeptId());
+                    teamDto.setName(team.getDeptName());
+                    teamDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(teamDto);
+                }
+                if (ObjectUtil.isNotNull(department)) {
+                    SysHomePageDetailQueryParamDto departmentDto = new SysHomePageDetailQueryParamDto();
+                    departmentDto.setId(department.getDeptId());
+                    departmentDto.setName(department.getDeptName());
+                    departmentDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(departmentDto);
+                }
+                if (ObjectUtil.isNotNull(brigade)) {
+                    SysHomePageDetailQueryParamDto departmentDto = new SysHomePageDetailQueryParamDto();
+                    departmentDto.setId(brigade.getDeptId());
+                    departmentDto.setName(brigade.getDeptName());
+                    departmentDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(departmentDto);
+                }
+                if (ObjectUtil.isNotNull(station)) {
+                    SysHomePageDetailQueryParamDto stationDto = new SysHomePageDetailQueryParamDto();
+                    stationDto.setId(station.getDeptId());
+                    stationDto.setName(station.getDeptName());
+                    stationDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(stationDto);
+                }
+            } else if (DataPermissionType.TEAM == dataPermission.getPermissionType() || DataPermissionType.DEPARTMENT == dataPermission.getPermissionType()) {
+                List<SysDept> deptList = deptService.selectAllDept(getDeptId());
+                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.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);
+
+                // 支持dataSource参数：individual=个人数据，team=班组数据（默认）
+                // 仅对班组长权限生效
+                if (DataPermissionType.TEAM == dataPermission.getPermissionType() && "individual".equalsIgnoreCase(dto.getDataSource())) {
+                    // 返回班组长个人数据（类似安检员视角）
+                    SysHomePageDetailQueryParamDto userDto = new SysHomePageDetailQueryParamDto();
+                    userDto.setId(getUserId());
+                    userDto.setName(getLoginUser().getUser().getNickName());
+                    userDto.setType(HomePageQueryEnum.USER.getCode());
+                    dtoList.add(userDto);
+                }
+
+                // 添加班组、主管、大队、站点信息
+                if (ObjectUtil.isNotNull(team)) {
+                    SysHomePageDetailQueryParamDto teamDto = new SysHomePageDetailQueryParamDto();
+                    teamDto.setId(team.getDeptId());
+                    teamDto.setName(team.getDeptName());
+                    teamDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(teamDto);
+                }
+                if (ObjectUtil.isNotNull(department)) {
+                    SysHomePageDetailQueryParamDto departmentDto = new SysHomePageDetailQueryParamDto();
+                    departmentDto.setId(department.getDeptId());
+                    departmentDto.setName(department.getDeptName());
+                    departmentDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(departmentDto);
+                }
+                if (ObjectUtil.isNotNull(brigade)) {
+                    SysHomePageDetailQueryParamDto departmentDto = new SysHomePageDetailQueryParamDto();
+                    departmentDto.setId(brigade.getDeptId());
+                    departmentDto.setName(brigade.getDeptName());
+                    departmentDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(departmentDto);
+                }
+                if (ObjectUtil.isNotNull(station)) {
+                    SysHomePageDetailQueryParamDto stationDto = new SysHomePageDetailQueryParamDto();
+                    stationDto.setId(station.getDeptId());
+                    stationDto.setName(station.getDeptName());
+                    stationDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(stationDto);
+                }
+            } else if (DataPermissionType.BRIGADE == dataPermission.getPermissionType()) {
+                SysDept sysDept = deptService.selectDeptById(getDeptId());
+                SysDept sysDeptStation = deptService.selectDeptById(sysDept.getParentId());
+                SysHomePageDetailQueryParamDto stationDto = new SysHomePageDetailQueryParamDto();
+                stationDto.setId(sysDeptStation.getDeptId());
+                stationDto.setName(sysDeptStation.getDeptName());
+                stationDto.setType(HomePageQueryEnum.DEPT.getCode());
+                dtoList.add(stationDto);
+                SysDept query = new SysDept();
+                query.setParentId(sysDeptStation.getDeptId());
+                List<SysDept> deptList = deptService.selectDeptInfoAll(query);
+                deptList.forEach(item -> {
+                    SysHomePageDetailQueryParamDto departmentDto = new SysHomePageDetailQueryParamDto();
+                    departmentDto.setId(item.getDeptId());
+                    departmentDto.setName(item.getDeptName());
+                    departmentDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(departmentDto);
+                });
+            } else if (DataPermissionType.STATION == dataPermission.getPermissionType()) {
+                SysDept sysDept = deptService.selectDeptById(getDeptId());
+                SysHomePageDetailQueryParamDto stationDto = new SysHomePageDetailQueryParamDto();
+                stationDto.setId(sysDept.getDeptId());
+                stationDto.setName(sysDept.getDeptName());
+                stationDto.setType(HomePageQueryEnum.DEPT.getCode());
+                dtoList.add(stationDto);
+                SysDept query = new SysDept();
+                query.setParentId(sysDept.getDeptId());
+                List<SysDept> deptList = deptService.selectDeptInfoAll(query);
+                deptList.forEach(item -> {
+                    SysHomePageDetailQueryParamDto departmentDto = new SysHomePageDetailQueryParamDto();
+                    departmentDto.setId(item.getDeptId());
+                    departmentDto.setName(item.getDeptName());
+                    departmentDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(departmentDto);
+                });
+            } else {
+                List<SysDept> deptListAll = deptService.selectDeptInfoAll(new SysDept());
+                List<SysDept> SysDeptStation = deptListAll.stream().filter(item -> ObjectUtil.equal(DeptTypeEnum.STATION.getCode(), item.getDeptType())).collect(Collectors.toList());
+                SysDeptStation.forEach(item -> {
+                    SysDept sysDept = deptService.selectDeptById(item.getDeptId());
+                    SysHomePageDetailQueryParamDto stationDto = new SysHomePageDetailQueryParamDto();
+                    stationDto.setId(sysDept.getDeptId());
+                    stationDto.setName(sysDept.getDeptName());
+                    stationDto.setType(HomePageQueryEnum.DEPT.getCode());
+                    dtoList.add(stationDto);
+                    SysDept query = new SysDept();
+                    query.setParentId(sysDept.getDeptId());
+                    List<SysDept> deptList = deptService.selectDeptInfoAll(query);
+                    deptList.forEach(department -> {
+                        SysHomePageDetailQueryParamDto departmentDto = new SysHomePageDetailQueryParamDto();
+                        departmentDto.setId(department.getDeptId());
+                        departmentDto.setName(department.getDeptName());
+                        departmentDto.setType(HomePageQueryEnum.DEPT.getCode());
+                        dtoList.add(departmentDto);
+                    });
+                });
+            }
+        } else {
+            List<SysDept> sysDeptList = deptService.selectAllDept(getDeptId());
+            Collections.reverse(sysDeptList);
+            SysDept sysDept = sysDeptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(null);
+            if (ObjectUtil.isNull(sysDept)) {
+                throw new ServiceException("未查询到站级部门信息");
+            }
+            SysHomePageDetailQueryParamDto stationDto = new SysHomePageDetailQueryParamDto();
+            stationDto.setId(sysDept.getDeptId());
+            stationDto.setName(sysDept.getDeptName());
+            stationDto.setType(HomePageQueryEnum.DEPT.getCode());
+            dtoList.add(stationDto);
+            SysDept query = new SysDept();
+            query.setParentId(sysDept.getDeptId());
+            List<SysDept> deptList = deptService.selectDeptInfoAll(query);
+            deptList.forEach(item -> {
+                SysHomePageDetailQueryParamDto departmentDto = new SysHomePageDetailQueryParamDto();
+                departmentDto.setId(item.getDeptId());
+                departmentDto.setName(item.getDeptName());
+                departmentDto.setType(HomePageQueryEnum.DEPT.getCode());
+                dtoList.add(departmentDto);
+            });
+        }
+        dtoList.forEach(item -> {
+            item.setSpecifiedDate(dto.getSpecifiedDate());
+            item.setStartDate(dto.getStartDate());
+            item.setEndDate(dto.getEndDate());
+        });
+        List<SysHomePageDetailDto> result = getSysHomePageDetailDtoList(dtoList);
+        return success(result);
+    }
+
+    /**
+     * 首页-明细（能力对比）
+     * 支持班组长角色使用dataSource参数：
+     * - 如果列表中包含班组数据，且dataSource=individual，则将班组数据替换为班组长个人数据
+     */
+    @PostMapping("/homePageDetail")
+    public AjaxResult homePageDetail(@RequestBody List<SysHomePageDetailQueryParamDto> dtoList) {
+        List<SysHomePageDetailDto> result = getSysHomePageDetailDtoList(dtoList);
+        return success(result);
+    }
+
+    /**
+     * 获取首页-明细
+     */
+    private List<SysHomePageDetailDto> getSysHomePageDetailDtoList(List<SysHomePageDetailQueryParamDto> dtoList) {
+        List<SysHomePageDetailDto> result = new ArrayList<>();
+        // 批量调用前统一初始化部门缓存，避免每次 getAnswersAccuracy 都重复查询数据库
+        accuracyStatisticsService.initDeptCache();
+        try {
+            for (SysHomePageDetailQueryParamDto item : dtoList) {
+                SysHomePageDetailDto resultItem = new SysHomePageDetailDto();
+                resultItem.setId(item.getId());
+                resultItem.setName(item.getName());
+                resultItem.setType(item.getType());
+                resultItem.setLearningGrowthScore(getLearningGrowthScore(item));
+                resultItem.setLearningGrowthScoreGraph(resultItem.getLearningGrowthScore().divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
+                resultItem.setCheckPassRate(getCheckPassRate(item));
+                resultItem.setCheckPassRateGraph(resultItem.getCheckPassRate());
+                resultItem.setSeizureCount(getSeizureCount(item));
+                resultItem.setSeizureCountGraph(getSeizureCountGraph(item));
+                resultItem.setWorkingHours(getWorkingHours(item));
+                resultItem.setWorkingHoursGraph(getWorkingHoursGraph(item));
+                // 抽问抽答正确率
+                resultItem.setAnswersAccuracy(getAnswersAccuracy(item));
+                resultItem.setAnswersAccuracyGraph(resultItem.getAnswersAccuracy());
+                result.add(resultItem);
+            }
+        } finally {
+            accuracyStatisticsService.clearDeptCache();
+        }
+        return result;
+    }
+
+    /**
+     * 获取抽问抽答正确率
+     */
+    private BigDecimal getAnswersAccuracy(SysHomePageDetailQueryParamDto item) {
+        Long userId = null;
+        Long deptId = null;
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            userId = item.getId();
+        } else {
+            deptId = item.getId();
+        }
+        return accuracyStatisticsService.getAccuracyRate(userId, deptId, item.getStartDate(), item.getEndDate());
+    }
+
+    /**
+     * 获取巡检合格率
+     */
+    private BigDecimal getCheckPassRate(SysHomePageDetailQueryParamDto item) {
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            dto.setUserId(item.getId());
+        } else {
+            dto.setDeptId(item.getId());
+        }
+        dto.setSpecifiedDate(item.getSpecifiedDate());
+        dto.setStartDate(item.getStartDate());
+        dto.setEndDate(item.getEndDate());
+        return checkLargeScreenService.checkPassRate(dto);
+    }
+
+    /**
+     * 获取培训答题平均分
+     */
+    private BigDecimal getLearningGrowthScore(SysHomePageDetailQueryParamDto item) {
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            dto.setUserId(item.getId());
+        } else {
+            dto.setDeptId(item.getId());
+        }
+        dto.setSpecifiedDate(item.getSpecifiedDate());
+        dto.setStartDate(item.getStartDate());
+        dto.setEndDate(item.getEndDate());
+        return sysLearningGrowthService.learningGrowthAverage(dto);
+    }
+
+    /**
+     * 部门值计算器函数式接口
+     */
+    @FunctionalInterface
+    private interface DeptValueCalculator {
+        BigDecimal calculate(String deptType, SysHomePageDetailQueryParamDto item);
+    }
+
+    /**
+     * 获取查获数量
+     */
+    private BigDecimal getSeizureCount(SysHomePageDetailQueryParamDto item) {
+        if (item.getEndDate() != null) {
+            item.setEndDate(DateUtils.addSeconds(DateUtils.truncate(item.getEndDate(), Calendar.DAY_OF_MONTH), 86399));
+        }
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            return seizureReportMapper.selectSelfSeizureCount(item.getId(), item.getStartDate(), item.getEndDate());
+        } else {
+            return calculateDeptBasedValue(item, this::calculateAverageSeizureCountForDeptType);
+        }
+    }
+
+    /**
+     * 获取查获数量图形
+     */
+    private BigDecimal getSeizureCountGraph(SysHomePageDetailQueryParamDto item) {
+        if (item.getEndDate() != null) {
+            item.setEndDate(DateUtils.addSeconds(DateUtils.truncate(item.getEndDate(), Calendar.DAY_OF_MONTH), 86399));
+        }
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            BigDecimal totalSeizure = seizureReportMapper.selectSelfSeizureCount(item.getId(), item.getStartDate(), item.getEndDate());
+            Long stationId = getStationIdByUserId(item.getId());
+            BigDecimal maxSeizureCount = seizureReportMapper.selectMaxSeizureCountInStation(stationId, item.getStartDate(), item.getEndDate());
+            return (maxSeizureCount != null && maxSeizureCount.compareTo(BigDecimal.ZERO) > 0) ?
+                    totalSeizure.divide(maxSeizureCount, 4, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+        } else {
+            return calculateDeptBasedValue(item, this::calculateSeizureCountGraphForDeptType);
+        }
+    }
+
+    /**
+     * 获取部门相关数值的通用方法
+     */
+    private BigDecimal calculateDeptBasedValue(SysHomePageDetailQueryParamDto item,
+                                               DeptValueCalculator calculator) {
+        SysDept sysDept = deptService.selectDeptById(item.getId());
+        if (sysDept == null) {
+            return BigDecimal.ZERO;
+        }
+        return calculator.calculate(sysDept.getDeptType(), item);
+    }
+
+    /**
+     * 平均查获数量计算
+     */
+    private BigDecimal calculateAverageSeizureCountForDeptType(String deptType, SysHomePageDetailQueryParamDto item) {
+        switch (deptType) {
+            case "TEAMS":
+                BigDecimal totalTeamSeizure = seizureReportMapper.selectTeamAverage(item.getId(), item.getStartDate(), item.getEndDate());
+                Integer teamUserCount = seizureReportMapper.selectUserCountByTeamId(item.getId());
+                return (teamUserCount != null && teamUserCount > 0) ?
+                        totalTeamSeizure.divide(new BigDecimal(teamUserCount), 2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+            case "MANAGER":
+                BigDecimal totalDepartmentSeizure = seizureReportMapper.selectDepartmentAverage(item.getId(), item.getStartDate(), item.getEndDate());
+                Integer deptUserCount = seizureReportMapper.selectUserCountByDepartmentId(item.getId());
+                return (deptUserCount != null && deptUserCount > 0) ?
+                        totalDepartmentSeizure.divide(new BigDecimal(deptUserCount), 2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+            case "BRIGADE":
+                BigDecimal totalBrigadeSeizure = seizureReportMapper.selectBrigadeAverage(item.getId(), item.getStartDate(), item.getEndDate());
+                Integer brigadeUserCount = seizureReportMapper.selectUserCountByBrigadeId(item.getId());
+                return (brigadeUserCount != null && brigadeUserCount > 0) ?
+                        totalBrigadeSeizure.divide(new BigDecimal(brigadeUserCount), 2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+            case "STATION":
+                BigDecimal totalStationSeizure = seizureReportMapper.selectStationAverage(item.getId(), item.getStartDate(), item.getEndDate());
+                Integer stationUserCount = seizureReportMapper.selectUserCountByStationId(item.getId());
+                return (stationUserCount != null && stationUserCount > 0) ?
+                        totalStationSeizure.divide(new BigDecimal(stationUserCount), 2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+            default:
+                return BigDecimal.ZERO;
+        }
+    }
+
+    /**
+     * 查获数量图表计算
+     */
+    private BigDecimal calculateSeizureCountGraphForDeptType(String deptType, SysHomePageDetailQueryParamDto item) {
+        switch (deptType) {
+            case "TEAMS":
+                Long sectionDeptId = seizureReportMapper.selectSectionDeptIdByTeamId(item.getId());
+                Long brigadeDeptId = seizureReportMapper.selectBrigadeDeptIdByDepartmentId(sectionDeptId);
+                Long stationId = seizureReportMapper.selectStationDeptIdByDeptId(brigadeDeptId);
+                BigDecimal totalTeamSeizure = seizureReportMapper.selectTeamAverage(item.getId(), item.getStartDate(), item.getEndDate());
+                //查询班级人数
+                Integer teamUserCount = seizureReportMapper.selectUserCountByTeamId(item.getId());
+                BigDecimal maxSeizureCount = seizureReportMapper.selectMaxSeizureCountInStation(stationId, item.getStartDate(), item.getEndDate());
+                return (maxSeizureCount != null && maxSeizureCount.compareTo(BigDecimal.ZERO) > 0 && teamUserCount != null && teamUserCount > 0) ?
+                        totalTeamSeizure.divide(new BigDecimal(teamUserCount), 2, RoundingMode.HALF_UP).divide(maxSeizureCount, 4, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+            case "MANAGER":
+                Long brigadeId = seizureReportMapper.selectBrigadeDeptIdByDepartmentId(item.getId());
+                Long deptStationId = seizureReportMapper.selectStationDeptIdByDeptId(brigadeId);
+                BigDecimal totalDepartmentSeizure = seizureReportMapper.selectDepartmentAverage(item.getId(), item.getStartDate(), item.getEndDate());
+                BigDecimal maxSeizureCountForDept = seizureReportMapper.selectMaxSeizureCountInStation(deptStationId, item.getStartDate(), item.getEndDate());
+                //查询科室人数
+                Integer deptUserCount = seizureReportMapper.selectUserCountByDepartmentId(item.getId());
+                return (maxSeizureCountForDept != null && maxSeizureCountForDept.compareTo(BigDecimal.ZERO) > 0 && deptUserCount != null && deptUserCount > 0) ?
+                        totalDepartmentSeizure.divide(new BigDecimal(deptUserCount), 2, RoundingMode.HALF_UP).divide(maxSeizureCountForDept, 4, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+            case "BRIGADE":
+                Long stationDeptId = seizureReportMapper.selectStationDeptIdByDeptId(item.getId());
+                BigDecimal totalBrigadeSeizure = seizureReportMapper.selectBrigadeAverage(item.getId(), item.getStartDate(), item.getEndDate());
+                BigDecimal maxSeizureCountFor = seizureReportMapper.selectMaxSeizureCountInStation(stationDeptId, item.getStartDate(), item.getEndDate());
+                //查询大队人数
+                Integer deptBrigadeUserCount = seizureReportMapper.selectUserCountByBrigadeId(item.getId());
+                return (maxSeizureCountFor != null && maxSeizureCountFor.compareTo(BigDecimal.ZERO) > 0 && deptBrigadeUserCount != null && deptBrigadeUserCount > 0) ?
+                        totalBrigadeSeizure.divide(new BigDecimal(deptBrigadeUserCount), 2, RoundingMode.HALF_UP).divide(maxSeizureCountFor, 4, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+            case "STATION":
+                BigDecimal totalStationSeizure = seizureReportMapper.selectStationAverage(item.getId(), item.getStartDate(), item.getEndDate());
+                BigDecimal maxSeizureCountForStation = seizureReportMapper.selectMaxSeizureCountInStation(item.getId(), item.getStartDate(), item.getEndDate());
+                //查询站人数
+                Integer stationUserCount = seizureReportMapper.selectUserCountByStationId(item.getId());
+                return (maxSeizureCountForStation != null && maxSeizureCountForStation.compareTo(BigDecimal.ZERO) > 0 && stationUserCount != null && stationUserCount > 0) ?
+                        totalStationSeizure.divide(new BigDecimal(stationUserCount), 2, RoundingMode.HALF_UP).divide(maxSeizureCountForStation, 4, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+            default:
+                return BigDecimal.ZERO;
+        }
+    }
+
+    /**
+     * 根据用户ID获取对应站点ID
+     */
+    private Long getStationIdByUserId(Long userId) {
+        SysUser sysUser = sysUserService.selectUserById(userId);
+        List<SysDept> deptList = deptService.selectAllDept(sysUser.getDeptId());
+        Collections.reverse(deptList);
+        SysDept station = deptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(null);
+        return station != null ? station.getDeptId() : 0;
+    }
+
+    private BigDecimal getWorkingHours(SysHomePageDetailQueryParamDto item) {
+        if (item.getEndDate() != null) {
+            item.setEndDate(DateUtils.addSeconds(DateUtils.truncate(item.getEndDate(), Calendar.DAY_OF_MONTH), 86399));
+        }
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            BigDecimal bigDecimal = attendancePostRecordService.selectPersonalTotalWorkDurationInTimeRange(item.getId(), item.getStartDate(), item.getEndDate());
+            return bigDecimal != null ? bigDecimal.divide(BigDecimal.valueOf(60), 2, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+        } else {
+            return calculateDeptBasedValue(item, this::calculateAverageWorkDurationForDeptType);
+        }
+    }
+
+    private BigDecimal getWorkingHoursGraph(SysHomePageDetailQueryParamDto item) {
+        if (item.getEndDate() != null) {
+            item.setEndDate(DateUtils.addSeconds(DateUtils.truncate(item.getEndDate(), Calendar.DAY_OF_MONTH), 86399));
+        }
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            BigDecimal totalWorkDuration = attendancePostRecordService.selectPersonalTotalWorkDurationInTimeRange(item.getId(), item.getStartDate(), item.getEndDate());
+            Long stationId = getStationIdByUserId(item.getId());
+            BigDecimal maxUserWorkDuration = attendancePostRecordService.selectTopUserWorkDurationInTimeRange(stationId, item.getStartDate(), item.getEndDate());
+            return (maxUserWorkDuration != null && maxUserWorkDuration.compareTo(BigDecimal.ZERO) > 0) ?
+                    totalWorkDuration.divide(maxUserWorkDuration, 4, RoundingMode.HALF_UP) : BigDecimal.ZERO;
+        } else {
+            return calculateDeptBasedValue(item, this::calculateWorkDurationForDeptType);
+        }
+    }
+
+    /**
+     * 平均工作时长计算
+     */
+    private BigDecimal calculateAverageWorkDurationForDeptType(String deptType, SysHomePageDetailQueryParamDto item) {
+        List<SysUser> sysUserList = sysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()), item.getId());
+        if (CollUtil.isEmpty(sysUserList)) {
+            return BigDecimal.ZERO;
+        }
+        List<Long> list = sysUserList.stream().map(SysUser::getUserId).distinct().collect(Collectors.toList());
+        int size = list.size();
+        BigDecimal totalWorkDuration = attendancePostRecordService.selectTotalWorkDurationInTimeRange(list, item.getStartDate(), item.getEndDate());
+        return totalWorkDuration.divide(new BigDecimal(60), 2, RoundingMode.HALF_UP).divide(new BigDecimal(size), 2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 工作时长图表计算
+     */
+    private BigDecimal calculateWorkDurationForDeptType(String deptType, SysHomePageDetailQueryParamDto item) {
+        List<SysDept> deptList = deptService.selectAllDept(item.getId());
+        if (CollUtil.isEmpty(deptList)) {
+            return BigDecimal.ZERO;
+        }
+        Collections.reverse(deptList);
+        SysDept station = deptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(null);
+        BigDecimal maxUserWorkDuration = attendancePostRecordService.selectTopUserWorkDurationInTimeRange(station.getDeptId(), item.getStartDate(), item.getEndDate());
+        if (maxUserWorkDuration == null || maxUserWorkDuration.compareTo(BigDecimal.ZERO) == 0) {
+            return BigDecimal.ZERO;
+        }
+        List<SysUser> sysUserList = sysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()), item.getId());
+        if (CollUtil.isEmpty(sysUserList)) {
+            return BigDecimal.ZERO;
+        }
+        List<Long> list = sysUserList.stream().map(SysUser::getUserId).distinct().collect(Collectors.toList());
+        int size = list.size();
+        BigDecimal totalWorkDuration = attendancePostRecordService.selectTotalWorkDurationInTimeRange(list, item.getStartDate(), item.getEndDate());
+        return totalWorkDuration.divide(new BigDecimal(size), 2, RoundingMode.HALF_UP).divide(maxUserWorkDuration, 4, RoundingMode.HALF_UP);
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysHomeReportController.java

@@ -0,0 +1,654 @@
+package com.sundot.airport.web.controller.system;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.metadata.style.WriteFont;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.sundot.airport.attendance.service.IAttendancePostRecordService;
+import com.sundot.airport.check.service.ICheckLargeScreenService;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.*;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.dto.AttendanceWorkDurationDto;
+import com.sundot.airport.common.enums.DeptType;
+import com.sundot.airport.common.enums.HomePageQueryEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.exam.service.IAccuracyStatisticsService;
+import com.sundot.airport.item.service.SeizureReportService;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysLearningGrowthService;
+import com.sundot.airport.system.service.ISysUserService;
+import lombok.SneakyThrows;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 首页报表控制器
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/homeReport")
+public class SysHomeReportController extends BaseController {
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Autowired
+    private ICheckLargeScreenService checkLargeScreenService;
+
+    @Autowired
+    private ISysLearningGrowthService sysLearningGrowthService;
+
+    @Autowired
+    private IAccuracyStatisticsService accuracyStatisticsService;
+
+    @Autowired
+    private SeizureReportService seizureReportService;
+
+    @Autowired
+    private IAttendancePostRecordService attendancePostRecordService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    /**
+     * 首页报表-下载
+     */
+    @SneakyThrows
+    @GetMapping("/download")
+    public void downloadHomeReport(HttpServletResponse response, BaseLargeScreenQueryParamDto dto) {
+        // 获取首页报表-整体
+        SysHomeReportDto result = getHomeReportDto(dto);
+        // 设置响应头
+        String fileName = URLEncoder.encode("首页报表", "UTF-8");
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
+
+        // 1. 创建表头样式
+        WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+
+        // 设置表头字体
+        WriteFont headWriteFont = new WriteFont();
+        headWriteFont.setFontHeightInPoints((short) 11);  // 字体大小
+        headWriteFont.setBold(true);                      // 加粗
+        headWriteFont.setFontName("宋体");                // 字体类型
+        headWriteFont.setColor(IndexedColors.BLACK.getIndex()); // 字体颜色
+        headWriteCellStyle.setWriteFont(headWriteFont);
+
+        // 设置表头单元格样式
+        headWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); // 背景色
+        headWriteCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND); // 填充模式
+        headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);    // 水平居中
+        headWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);      // 垂直居中
+        headWriteCellStyle.setWrapped(true);  // 自动换行
+
+        // 设置表头边框 - 细实线
+        headWriteCellStyle.setBorderLeft(BorderStyle.THIN);
+        headWriteCellStyle.setBorderRight(BorderStyle.THIN);
+        headWriteCellStyle.setBorderTop(BorderStyle.THIN);
+        headWriteCellStyle.setBorderBottom(BorderStyle.THIN);
+
+        // 设置边框颜色
+        headWriteCellStyle.setTopBorderColor(IndexedColors.BLACK.getIndex());
+        headWriteCellStyle.setBottomBorderColor(IndexedColors.BLACK.getIndex());
+        headWriteCellStyle.setLeftBorderColor(IndexedColors.BLACK.getIndex());
+        headWriteCellStyle.setRightBorderColor(IndexedColors.BLACK.getIndex());
+
+        // 2. 创建内容样式
+        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+
+        // 设置内容字体
+        WriteFont contentWriteFont = new WriteFont();
+        contentWriteFont.setFontHeightInPoints((short) 11);  // 内容字体大小
+        contentWriteFont.setFontName("宋体");
+        contentWriteFont.setColor(IndexedColors.BLACK.getIndex());
+        contentWriteCellStyle.setWriteFont(contentWriteFont);
+
+        // 设置内容单元格样式
+        contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+        contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        contentWriteCellStyle.setWrapped(true);
+
+        // 设置内容边框 - 细实线
+        contentWriteCellStyle.setBorderLeft(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderRight(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);
+
+        // 设置边框颜色
+        contentWriteCellStyle.setTopBorderColor(IndexedColors.BLACK.getIndex());
+        contentWriteCellStyle.setBottomBorderColor(IndexedColors.BLACK.getIndex());
+        contentWriteCellStyle.setLeftBorderColor(IndexedColors.BLACK.getIndex());
+        contentWriteCellStyle.setRightBorderColor(IndexedColors.BLACK.getIndex());
+
+        HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+
+        // 创建ExcelWriter
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream())
+                .registerWriteHandler(horizontalCellStyleStrategy)
+                .build();
+
+        try {
+            // 第一个sheet：巡检合格率
+            WriteSheet checkSheet = EasyExcel.writerSheet(0, "巡检合格率")
+                    .head(SysHomeReportDetailCheckExcelDto.class)
+                    .build();
+            List<SysHomeReportDetailCheckExcelDto> checkExcelData = getCheckExcelDtoData(result.getCheckList());
+            excelWriter.write(checkExcelData, checkSheet);
+
+            // 第二个sheet：培训答题分数
+            WriteSheet learningSheet = EasyExcel.writerSheet(1, "培训答题分数")
+                    .head(SysHomeReportDetailLearningExcelDto.class)
+                    .build();
+            List<SysHomeReportDetailLearningExcelDto> learningExcelData = getLearningExcelDtoData(result.getLearningList());
+            excelWriter.write(learningExcelData, learningSheet);
+
+            // 第三个sheet：抽问抽答正确率
+            WriteSheet answerSheet = EasyExcel.writerSheet(2, "抽问抽答正确率")
+                    .head(SysHomeReportDetailAnswerExcelDto.class)
+                    .build();
+            List<SysHomeReportDetailAnswerExcelDto> answerExcelData = getAnswerExcelDtoData(result.getAnswerList());
+            excelWriter.write(answerExcelData, answerSheet);
+
+            // 第四个sheet：查获数量
+            WriteSheet seizureSheet = EasyExcel.writerSheet(3, "查获数量")
+                    .head(SysHomeReportDetailSeizureExcelDto.class)
+                    .build();
+            List<SysHomeReportDetailSeizureExcelDto> seizureExcelData = getSeizureExcelDtoData(result.getSeizureList());
+            excelWriter.write(seizureExcelData, seizureSheet);
+
+            // 第五个sheet：工作时长
+            WriteSheet workingSheet = EasyExcel.writerSheet(4, "工作时长")
+                    .head(SysHomeReportDetailWorkingExcelDto.class)
+                    .build();
+            List<SysHomeReportDetailWorkingExcelDto> workingExcelData = getWorkingExcelDtoData(result.getWorkingList());
+            excelWriter.write(workingExcelData, workingSheet);
+        } catch (Exception e) {
+            throw new RuntimeException("导出报表失败", e);
+        } finally {
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
+    }
+
+    /**
+     * 获取首页报表下载数据-工作时长
+     *
+     * @param workingList
+     * @return
+     */
+    private List<SysHomeReportDetailWorkingExcelDto> getWorkingExcelDtoData(List<SysHomeReportDetailDto> workingList) {
+        List<SysHomeReportDetailWorkingExcelDto> result = new ArrayList<>();
+        workingList.forEach(item -> {
+            SysHomeReportDetailWorkingExcelDto excelDto = new SysHomeReportDetailWorkingExcelDto();
+            excelDto.setName(item.getName());
+            excelDto.setTotalNumber(item.getTotalNumber());
+            excelDto.setAverageNumber(item.getAverageNumber());
+            excelDto.setMedianNumber(item.getMedianNumber());
+            excelDto.setMaxNumber(item.getMaxNumber());
+            excelDto.setMinNumber(item.getMinNumber());
+            result.add(excelDto);
+        });
+        return result;
+    }
+
+    /**
+     * 获取首页报表下载数据-巡检合格率
+     */
+    private List<SysHomeReportDetailCheckExcelDto> getCheckExcelDtoData(List<SysHomeReportDetailDto> checkList) {
+        List<SysHomeReportDetailCheckExcelDto> result = new ArrayList<>();
+        checkList.forEach(item -> {
+            SysHomeReportDetailCheckExcelDto excelDto = new SysHomeReportDetailCheckExcelDto();
+            excelDto.setName(item.getName());
+            excelDto.setAverageNumber(item.getAverageNumber().multiply(BigDecimal.valueOf(100)));
+            excelDto.setMedianNumber(item.getMedianNumber().multiply(BigDecimal.valueOf(100)));
+            excelDto.setMaxNumber(item.getMaxNumber().multiply(BigDecimal.valueOf(100)));
+            excelDto.setMinNumber(item.getMinNumber().multiply(BigDecimal.valueOf(100)));
+            result.add(excelDto);
+        });
+        return result;
+    }
+
+    /**
+     * 获取首页报表下载数据-培训答题分数
+     */
+    private List<SysHomeReportDetailLearningExcelDto> getLearningExcelDtoData(List<SysHomeReportDetailDto> learningList) {
+        List<SysHomeReportDetailLearningExcelDto> result = new ArrayList<>();
+        learningList.forEach(item -> {
+            SysHomeReportDetailLearningExcelDto excelDto = new SysHomeReportDetailLearningExcelDto();
+            excelDto.setName(item.getName());
+            excelDto.setAverageNumber(item.getAverageNumber());
+            excelDto.setMedianNumber(item.getMedianNumber());
+            excelDto.setMaxNumber(item.getMaxNumber());
+            excelDto.setMinNumber(item.getMinNumber());
+            result.add(excelDto);
+        });
+        return result;
+    }
+
+    /**
+     * 获取首页报表下载数据-抽问抽答正确率
+     */
+    private List<SysHomeReportDetailAnswerExcelDto> getAnswerExcelDtoData(List<SysHomeReportDetailDto> answerList) {
+        List<SysHomeReportDetailAnswerExcelDto> result = new ArrayList<>();
+        if (answerList != null) {
+            answerList.forEach(item -> {
+                SysHomeReportDetailAnswerExcelDto excelDto = new SysHomeReportDetailAnswerExcelDto();
+                excelDto.setName(item.getName());
+                excelDto.setAverageNumber(item.getAverageNumber());
+                excelDto.setMedianNumber(item.getMedianNumber());
+                excelDto.setMaxNumber(item.getMaxNumber());
+                excelDto.setMinNumber(item.getMinNumber());
+                result.add(excelDto);
+            });
+        }
+        return result;
+    }
+
+    /**
+     * 获取首页报表下载数据-查获数量
+     */
+    private List<SysHomeReportDetailSeizureExcelDto> getSeizureExcelDtoData(List<SysHomeReportDetailDto> learningList) {
+        List<SysHomeReportDetailSeizureExcelDto> result = new ArrayList<>();
+        learningList.forEach(item -> {
+            SysHomeReportDetailSeizureExcelDto excelDto = new SysHomeReportDetailSeizureExcelDto();
+            excelDto.setName(item.getName());
+            excelDto.setTotalNumber(item.getTotalNumber());
+            excelDto.setAverageNumber(item.getAverageNumber());
+            excelDto.setMedianNumber(item.getMedianNumber());
+            excelDto.setMaxNumber(item.getMaxNumber());
+            excelDto.setMinNumber(item.getMinNumber());
+            result.add(excelDto);
+        });
+        return result;
+    }
+
+    /**
+     * 首页报表-整体
+     */
+    @GetMapping("/homeReportWhole")
+    public AjaxResult homePageWhole(BaseLargeScreenQueryParamDto dto) {
+        SysHomeReportDto result = getHomeReportDto(dto);
+        return success(result);
+    }
+
+    /**
+     * 获取首页报表-整体
+     */
+    private SysHomeReportDto getHomeReportDto(BaseLargeScreenQueryParamDto dto) {
+        List<SysHomePageDetailQueryParamDto> dtoList = new ArrayList<>();
+        List<SysDept> sysDeptList = deptService.selectAllDept(getDeptId());
+        Collections.reverse(sysDeptList);
+        SysDept stationDept = sysDeptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(null);
+        if (ObjectUtil.isNull(stationDept)) {
+            throw new ServiceException("未查询到站级部门信息");
+        }
+        SysHomePageDetailQueryParamDto stationDto = new SysHomePageDetailQueryParamDto();
+        stationDto.setId(stationDept.getDeptId());
+        stationDto.setName(stationDept.getDeptName());
+        stationDto.setType(HomePageQueryEnum.DEPT.getCode());
+        dtoList.add(stationDto);
+        SysDept queryDept = new SysDept();
+        queryDept.setParentId(stationDept.getDeptId());
+        List<SysDept> deptList = deptService.selectDeptInfoAll(queryDept);
+        deptList.forEach(item -> {
+            SysHomePageDetailQueryParamDto departmentDto = new SysHomePageDetailQueryParamDto();
+            departmentDto.setId(item.getDeptId());
+            departmentDto.setName(item.getDeptName());
+            departmentDto.setType(HomePageQueryEnum.DEPT.getCode());
+            dtoList.add(departmentDto);
+        });
+
+        dtoList.forEach(item -> {
+            item.setSpecifiedDate(dto.getSpecifiedDate());
+            item.setStartDate(dto.getStartDate());
+            item.setEndDate(dto.getEndDate());
+        });
+        SysHomeReportDto result = getSysHomeReportDto(dtoList);
+        return result;
+    }
+
+    /**
+     * 首页报表-明细
+     */
+    @PostMapping("/homeReportDetail")
+    public AjaxResult homePageDetail(@RequestBody List<SysHomePageDetailQueryParamDto> dtoList) {
+        SysHomeReportDto result = getSysHomeReportDto(dtoList);
+        return success(result);
+    }
+
+    /**
+     * 获取首页报表-明细
+     */
+    private SysHomeReportDto getSysHomeReportDto(List<SysHomePageDetailQueryParamDto> dtoList) {
+        SysHomeReportDto result = new SysHomeReportDto();
+        // 培训答题分数
+        result.setLearningList(getLearningList(dtoList));
+        // 巡检合格率
+        result.setCheckList(getCheckList(dtoList));
+        // 查获数量
+        result.setSeizureList(getSeizureList(dtoList));
+        // 在岗时长
+        result.setWorkingList(getWorkingList(dtoList));
+        // 抽问抽答正确率
+        result.setAnswerList(getAnswerList(dtoList));
+        return result;
+    }
+
+
+    /**
+     * 获取首页报表-明细-查获数量
+     */
+    private List<SysHomeReportDetailDto> getSeizureList(List<SysHomePageDetailQueryParamDto> dtoList) {
+        List<SysHomeReportDetailDto> result = new ArrayList<>();
+        for (SysHomePageDetailQueryParamDto item : dtoList) {
+            result.add(getSeizure(item));
+        }
+        return result;
+    }
+
+    /**
+     * 获取首页报表-明细-培训答题分数
+     */
+    private List<SysHomeReportDetailDto> getLearningList(List<SysHomePageDetailQueryParamDto> dtoList) {
+        List<SysHomeReportDetailDto> result = new ArrayList<>();
+        for (SysHomePageDetailQueryParamDto item : dtoList) {
+            result.add(getLearning(item));
+        }
+        return result;
+    }
+
+    /**
+     * 获取首页报表-明细-巡检合格率
+     */
+    private List<SysHomeReportDetailDto> getCheckList(List<SysHomePageDetailQueryParamDto> dtoList) {
+        List<SysHomeReportDetailDto> result = new ArrayList<>();
+        for (SysHomePageDetailQueryParamDto item : dtoList) {
+            result.add(getCheck(item));
+        }
+        return result;
+    }
+
+    /**
+     * 获取巡检合格率数据
+     */
+    private SysHomeReportDetailDto getCheck(SysHomePageDetailQueryParamDto item) {
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            dto.setUserId(item.getId());
+        } else {
+            dto.setDeptId(item.getId());
+        }
+        dto.setSpecifiedDate(item.getSpecifiedDate());
+        dto.setStartDate(item.getStartDate());
+        dto.setEndDate(item.getEndDate());
+        return checkLargeScreenService.checkData(dto);
+    }
+
+    /**
+     * 获取培训答题分数数据
+     */
+    private SysHomeReportDetailDto getLearning(SysHomePageDetailQueryParamDto item) {
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            dto.setUserId(item.getId());
+        } else {
+            dto.setDeptId(item.getId());
+        }
+        dto.setSpecifiedDate(item.getSpecifiedDate());
+        dto.setStartDate(item.getStartDate());
+        dto.setEndDate(item.getEndDate());
+        return sysLearningGrowthService.learningGrowthData(dto);
+    }
+
+    /**
+     * 获取查获数量数据
+     */
+    private SysHomeReportDetailDto getSeizure(SysHomePageDetailQueryParamDto item) {
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            dto.setUserId(item.getId());
+        } else {
+            dto.setDeptId(item.getId());
+        }
+        dto.setSpecifiedDate(item.getSpecifiedDate());
+        dto.setStartDate(item.getStartDate());
+        dto.setEndDate(item.getEndDate());
+        return seizureReportService.seizureData(dto);
+    }
+
+    /**
+     * 获取首页报表-明细-抽问抽答正确率
+     */
+    private List<SysHomeReportDetailDto> getAnswerList(List<SysHomePageDetailQueryParamDto> dtoList) {
+        List<SysHomeReportDetailDto> result = new ArrayList<>();
+        // 批量调用前统一初始化部门缓存，避免每次 answerData 都重复查询数据库
+        accuracyStatisticsService.initDeptCache();
+        try {
+            for (SysHomePageDetailQueryParamDto item : dtoList) {
+                result.add(getAnswer(item));
+            }
+        } finally {
+            accuracyStatisticsService.clearDeptCache();
+        }
+        return result;
+    }
+
+    /**
+     * 获取抽问抽答正确率数据
+     */
+    private SysHomeReportDetailDto getAnswer(SysHomePageDetailQueryParamDto item) {
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            dto.setUserId(item.getId());
+        } else {
+            dto.setDeptId(item.getId());
+        }
+        dto.setSpecifiedDate(item.getSpecifiedDate());
+        dto.setStartDate(item.getStartDate());
+        dto.setEndDate(item.getEndDate());
+        return accuracyStatisticsService.answerData(dto);
+    }
+
+    private List<SysHomeReportDetailDto> getWorkingList(List<SysHomePageDetailQueryParamDto> dtoList) {
+        List<SysHomeReportDetailDto> result = new ArrayList<>();
+        for (SysHomePageDetailQueryParamDto item : dtoList) {
+            result.add(getWorking(item));
+        }
+        return result;
+    }
+
+    private SysHomeReportDetailDto getWorking(SysHomePageDetailQueryParamDto item) {
+        // 构建查询参数
+        BaseLargeScreenQueryParamDto dto = new BaseLargeScreenQueryParamDto();
+        if (StrUtil.equals(HomePageQueryEnum.USER.getCode(), item.getType())) {
+            dto.setUserId(item.getId());
+        } else {
+            dto.setDeptId(item.getId());
+        }
+        dto.setSpecifiedDate(item.getSpecifiedDate());
+        dto.setStartDate(item.getStartDate());
+        dto.setEndDate(item.getEndDate());
+        return getWorkingHoursData(dto);
+    }
+
+    /**
+     * 获取在岗时长数据
+     */
+    public SysHomeReportDetailDto getWorkingHoursData(BaseLargeScreenQueryParamDto dto) {
+        if (ObjectUtils.isNull(dto.getUserId()) && ObjectUtils.isNull(dto.getDeptId())) {
+            throw new ServiceException("用户ID和部门ID不能同时为空");
+        }
+        // 默认筛选条件
+        if (ObjectUtils.isNull(dto.getStartDate()) && ObjectUtils.isNull(dto.getEndDate()) && ObjectUtils.isNull(dto.getSpecifiedDate())) {
+            dto.setEndDate(DateUtils.addSeconds(DateUtils.truncate(DateUtils.getNowDate(), Calendar.DAY_OF_MONTH), 86399));
+            dto.setStartDate(DateUtils.addDays(DateUtils.truncate(DateUtils.getNowDate(), Calendar.DAY_OF_MONTH), -6));
+        }
+
+        SysHomeReportDetailDto result = new SysHomeReportDetailDto();
+
+        // 全量数据 - 根据用户ID或部门ID获取对应的在岗记录
+        List<AttendanceWorkDurationDto> itemListAll = getAttendanceWorkDurationList(dto);
+
+        List<AttendanceWorkDurationDto> targetList;
+        if (ObjectUtils.isNotNull(dto.getUserId())) {
+            SysUser sysUser = sysUserService.selectUserById(dto.getUserId());
+            if (ObjectUtils.isNull(sysUser)) {
+                throw new ServiceException("【" + dto.getUserId() + "】用户不存在");
+            }
+            result.setId(sysUser.getUserId());
+            result.setName(sysUser.getNickName());
+            result.setType(HomePageQueryEnum.USER.getCode());
+            targetList = itemListAll.stream().filter(item -> ObjectUtil.equals(item.getId(), dto.getUserId())).collect(Collectors.toList());
+        } else {
+            SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
+            if (ObjectUtils.isNull(sysDept)) {
+                throw new ServiceException("部门不存在");
+            }
+            result.setId(sysDept.getDeptId());
+            result.setName(sysDept.getDeptName());
+            result.setType(HomePageQueryEnum.DEPT.getCode());
+            // 根据部门ID查询该部门下的用户列表（这里可以根据实际角色进行调整）
+            List<SysUser> sysUserList = sysUserService.selectUserListByRoleKeyAndDeptId(
+                    Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()),
+                    dto.getDeptId()
+            );
+            List<Long> userIdList = sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList());
+            targetList = itemListAll.stream().filter(item -> userIdList.contains(item.getId())).collect(Collectors.toList());
+        }
+
+        // 提取工作时长数值并排序
+        List<BigDecimal> targetValueList = targetList.stream()
+                .map(AttendanceWorkDurationDto::getWorkDuration)
+                .filter(Objects::nonNull)
+                .sorted()
+                .collect(Collectors.toList());
+
+        if (CollUtil.isEmpty(targetValueList)) {
+            return result;
+        }
+
+        // 最大值
+        result.setMaxNumber(targetValueList.get(targetValueList.size() - 1));
+        // 最小值
+        result.setMinNumber(targetValueList.get(0));
+        // 总和
+        BigDecimal sum = targetValueList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setTotalNumber(sum);
+        // 总数
+        long totalCount = targetList.stream().map(AttendanceWorkDurationDto::getId).distinct().count();
+        // 平均值
+        result.setAverageNumber(sum.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_UP));
+        // 中位数
+        int size = targetValueList.size();
+        int middle = size / 2;
+        if (size % 2 == 1) {
+            result.setMedianNumber(targetValueList.get(middle));
+        } else {
+            result.setMedianNumber(targetValueList.get(middle - 1).add(targetValueList.get(middle)).divide(new BigDecimal(2), 2, RoundingMode.HALF_UP));
+        }
+        return result;
+    }
+
+    /**
+     * 获取在岗工作时长列表
+     */
+    private List<AttendanceWorkDurationDto> getAttendanceWorkDurationList(BaseLargeScreenQueryParamDto dto) {
+        List<AttendanceWorkDurationDto> result = new ArrayList<>();
+
+        if (ObjectUtils.isNotNull(dto.getUserId())) {
+            // 查询指定用户的总工作时长
+            BigDecimal workDuration = attendancePostRecordService.selectPersonalTotalWorkDurationInTimeRange(
+                    dto.getUserId(),
+                    dto.getStartDate(),
+                    dto.getEndDate()
+            );
+            if (workDuration != null) {
+                // 将分钟转换为小时
+                workDuration = workDuration.divide(new BigDecimal(60), 2, RoundingMode.HALF_UP);
+                AttendanceWorkDurationDto item = new AttendanceWorkDurationDto();
+                item.setId(dto.getUserId());
+                item.setWorkDuration(workDuration);
+                result.add(item);
+            }
+        } else if (ObjectUtils.isNotNull(dto.getDeptId())) {
+            // 根据部门查询该部门下所有用户的工作时长
+            SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
+            if (sysDept != null) {
+                // 根据部门查询该部门下的所有用户
+                List<SysUser> sysUserList = sysUserService.selectUserListByRoleKeyAndDeptId(
+                        Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()),
+                        dto.getDeptId()
+                );
+
+                // 提取用户ID列表
+                List<Long> userIds = sysUserList.stream()
+                        .map(SysUser::getUserId).distinct()
+                        .collect(Collectors.toList());
+
+                // 批量查询所有用户的工作时长
+                List<AttendanceWorkDurationDto> workDurationList = attendancePostRecordService.selectBatchPersonalTotalWorkDurationInTimeRange(
+                        userIds,
+                        dto.getStartDate(),
+                        dto.getEndDate()
+                );
+
+                // 将查询结果转换为Map便于查找
+                Map<Long, BigDecimal> workDurationMap = workDurationList.stream()
+                        .collect(Collectors.toMap(
+                                AttendanceWorkDurationDto::getId,
+                                AttendanceWorkDurationDto::getWorkDuration,
+                                (existing, replacement) -> existing
+                        ));
+
+                // 组装结果
+                for (SysUser user : sysUserList) {
+                    BigDecimal workDuration = workDurationMap.get(user.getUserId());
+                    if (workDuration == null) {
+                        workDuration = BigDecimal.ZERO;
+                    }
+                    if (workDuration.compareTo(BigDecimal.ZERO) > 0) {
+                        // 将分钟转换为小时
+                        workDuration = workDuration.divide(new BigDecimal(60), 2, RoundingMode.HALF_UP);
+                    }
+                    AttendanceWorkDurationDto item = new AttendanceWorkDurationDto();
+                    item.setId(user.getUserId());
+                    item.setWorkDuration(workDuration);
+                    result.add(item);
+                }
+            }
+        }
+
+        return result;
+    }
+
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysIndexController.java

@@ -0,0 +1,29 @@
+package com.sundot.airport.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.config.RuoYiConfig;
+import com.sundot.airport.common.utils.StringUtils;
+
+/**
+ * 首页
+ *
+ * @author ruoyi
+ */
+@RestController
+public class SysIndexController
+{
+    /** 系统基础配置 */
+    @Autowired
+    private RuoYiConfig ruoyiConfig;
+
+    /**
+     * 访问首页，提示语
+     */
+    @RequestMapping("/")
+    public String index()
+    {
+        return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysLearningGrowthController.java

@@ -0,0 +1,175 @@
+package com.sundot.airport.web.controller.system;
+
+import java.math.BigDecimal;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.system.domain.SysLargeScreenLearningGrowthDto;
+import com.sundot.airport.system.domain.SysLargeScreenLearningGrowthOrganizationalSupportDto;
+import com.sundot.airport.system.domain.SysLargeScreenLearningGrowthQueryParamDto;
+import lombok.SneakyThrows;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.SysLearningGrowth;
+import com.sundot.airport.system.service.ISysLearningGrowthService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 学习成长Controller
+ *
+ * @author ruoyi
+ * @date 2025-10-22
+ */
+@RestController
+@RequestMapping("/system/growth")
+public class SysLearningGrowthController extends BaseController {
+    @Autowired
+    private ISysLearningGrowthService sysLearningGrowthService;
+
+    /**
+     * 查询学习成长列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:growth:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysLearningGrowth sysLearningGrowth) {
+        startPage();
+        List<SysLearningGrowth> list = sysLearningGrowthService.selectSysLearningGrowthList(sysLearningGrowth);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学习成长列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:growth:export')")
+    @Log(title = "学习成长", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysLearningGrowth sysLearningGrowth) {
+        List<SysLearningGrowth> list = sysLearningGrowthService.selectSysLearningGrowthList(sysLearningGrowth);
+        ExcelUtil<SysLearningGrowth> util = new ExcelUtil<SysLearningGrowth>(SysLearningGrowth.class);
+        util.exportExcel(response, list, "学习成长数据");
+    }
+
+    /**
+     * 获取学习成长详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:growth:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(sysLearningGrowthService.selectSysLearningGrowthById(id));
+    }
+
+    /**
+     * 新增学习成长
+     */
+    @PreAuthorize("@ss.hasPermi('system:growth:add')")
+    @Log(title = "学习成长", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SysLearningGrowth sysLearningGrowth) {
+        sysLearningGrowth.setCreateBy(getUsername());
+        return toAjax(sysLearningGrowthService.insertSysLearningGrowth(sysLearningGrowth));
+    }
+
+    /**
+     * 修改学习成长
+     */
+    @PreAuthorize("@ss.hasPermi('system:growth:edit')")
+    @Log(title = "学习成长", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody SysLearningGrowth sysLearningGrowth) {
+        sysLearningGrowth.setUpdateBy(getUsername());
+        return toAjax(sysLearningGrowthService.updateSysLearningGrowth(sysLearningGrowth));
+    }
+
+    /**
+     * 删除学习成长
+     */
+    @PreAuthorize("@ss.hasPermi('system:growth:remove')")
+    @Log(title = "学习成长", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(sysLearningGrowthService.deleteSysLearningGrowthByIds(ids));
+    }
+
+    /**
+     * 下载模板
+     */
+    @Log(title = "学习成长", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:growth:import')")
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<SysLearningGrowth> util = new ExcelUtil<SysLearningGrowth>(SysLearningGrowth.class);
+        util.importTemplateExcel(response, "学习成长");
+    }
+
+    /**
+     * 导入数据
+     */
+    @SneakyThrows
+    @Log(title = "学习成长", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:growth:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) {
+        ExcelUtil<SysLearningGrowth> util = new ExcelUtil<SysLearningGrowth>(SysLearningGrowth.class);
+        List<SysLearningGrowth> list = util.importExcel(file.getInputStream());
+        String operName = getUsername();
+        String message = sysLearningGrowthService.importData(list, updateSupport, operName);
+        return success(message);
+    }
+
+    /**
+     * 能力画像-学习成长
+     */
+    @Cacheable(
+            value = "statistics_list",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/portrait")
+    public AjaxResult portrait(SysLargeScreenLearningGrowthQueryParamDto dto) {
+        List<SysLargeScreenLearningGrowthDto> result = sysLearningGrowthService.portrait(dto);
+        return success(result);
+    }
+
+    /**
+     * 工作画像-组织支撑-培训测试平均分趋势图
+     */
+    @Cacheable(
+            value = "statistics_list",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/organizationalSupport")
+    public AjaxResult organizationalSupport(SysLargeScreenLearningGrowthQueryParamDto dto) {
+        List<SysLargeScreenLearningGrowthOrganizationalSupportDto> result = sysLearningGrowthService.organizationalSupport(dto);
+        return success(result);
+    }
+
+    /**
+     * 首页-学习成长-平均分
+     */
+//    @Cacheable(
+//            value = "statistics_learningGrowth_average",
+//            keyGenerator = "statisticsKeyGenerator",
+//            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+//    )
+    @GetMapping("/learningGrowthAverage")
+    public AjaxResult learningGrowthAverage(BaseLargeScreenQueryParamDto dto) {
+        BigDecimal result = sysLearningGrowthService.learningGrowthAverage(dto);
+        return success(result);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysLoginController.java

@@ -0,0 +1,137 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import com.sundot.airport.common.dto.UserInfo;
+import com.sundot.airport.web.core.cache.UserCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.constant.Constants;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysMenu;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.core.domain.model.LoginBody;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.core.text.Convert;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.framework.web.service.SysLoginService;
+import com.sundot.airport.framework.web.service.SysPermissionService;
+import com.sundot.airport.framework.web.service.TokenService;
+import com.sundot.airport.system.service.ISysConfigService;
+import com.sundot.airport.system.service.ISysMenuService;
+
+/**
+ * 登录验证
+ *
+ * @author ruoyi
+ */
+@RestController
+public class SysLoginController {
+    @Autowired
+    private UserCache userCache;
+
+    @Autowired
+    private SysLoginService loginService;
+
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 登录方法
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login")
+    public AjaxResult login(@RequestBody LoginBody loginBody) {
+        AjaxResult ajax = AjaxResult.success();
+        String token;
+        // 判断登录类型
+        if ("sms".equals(loginBody.getLoginType())) {
+            // 短信验证码登录
+            token = loginService.smsLogin(loginBody);
+        } else {
+            // 密码登录（默认）
+            token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                    loginBody.getUuid());
+        }
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
+    /**
+     * 获取用户信息
+     *
+     * @return 用户信息
+     */
+    @GetMapping("getInfo")
+    public AjaxResult getInfo() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser user = loginUser.getUser();
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(user);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(user);
+        if (!loginUser.getPermissions().equals(permissions)) {
+            loginUser.setPermissions(permissions);
+            tokenService.refreshToken(loginUser);
+        }
+        UserInfo userInfo = userCache.getUserInfo(user.getUserId());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("user", user);
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
+        ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
+        ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
+        ajax.put("userInfo", userInfo);
+        return ajax;
+    }
+
+    /**
+     * 获取路由信息
+     *
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    public AjaxResult getRouters() {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        return AjaxResult.success(menuService.buildMenus(menus));
+    }
+
+    // 检查初始密码是否提醒修改
+    public boolean initPasswordIsModify(Date pwdUpdateDate) {
+        Integer initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify"));
+        return initPasswordModify != null && initPasswordModify == 1 && pwdUpdateDate == null;
+    }
+
+    // 检查密码是否过期
+    public boolean passwordIsExpiration(Date pwdUpdateDate) {
+        Integer passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays"));
+        if (passwordValidateDays != null && passwordValidateDays > 0) {
+            if (StringUtils.isNull(pwdUpdateDate)) {
+                // 如果从未修改过初始密码，直接提醒过期
+                return true;
+            }
+            Date nowDate = DateUtils.getNowDate();
+            return DateUtils.differentDaysByMillisecond(nowDate, pwdUpdateDate) > passwordValidateDays;
+        }
+        return false;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysMenuController.java

@@ -0,0 +1,125 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.constant.UserConstants;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysMenu;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.system.service.ISysMenuService;
+
+/**
+ * 菜单信息
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/menu")
+public class SysMenuController extends BaseController {
+    @Autowired
+    private ISysMenuService menuService;
+
+    /**
+     * 获取菜单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @GetMapping("/list")
+    public AjaxResult list(SysMenu menu) {
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        return success(menus);
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    @GetMapping(value = "/{menuId}")
+    public AjaxResult getInfo(@PathVariable Long menuId) {
+        return success(menuService.selectMenuById(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysMenu menu) {
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        return success(menuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
+        List<SysMenu> menus = menuService.selectMenuList(getUserId());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        return ajax;
+    }
+
+    /**
+     * 新增菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysMenu menu) {
+        if (!menuService.checkMenuNameUnique(menu)) {
+            return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
+            return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        menu.setCreateBy(getUsername());
+        return toAjax(menuService.insertMenu(menu));
+    }
+
+    /**
+     * 修改菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
+        if (!menuService.checkMenuNameUnique(menu)) {
+            return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
+            return error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        } else if (menu.getMenuId().equals(menu.getParentId())) {
+            return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+        }
+        menu.setUpdateBy(getUsername());
+        return toAjax(menuService.updateMenu(menu));
+    }
+
+    /**
+     * 删除菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{menuId}")
+    public AjaxResult remove(@PathVariable("menuId") Long menuId) {
+        if (menuService.hasChildByMenuId(menuId)) {
+            return warn("存在子菜单,不允许删除");
+        }
+        if (menuService.checkMenuExistRole(menuId)) {
+            return warn("菜单已分配,不允许删除");
+        }
+        return toAjax(menuService.deleteMenuById(menuId));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysNoticeController.java

@@ -0,0 +1,88 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.SysNotice;
+import com.sundot.airport.system.service.ISysNoticeService;
+
+/**
+ * 公告 信息操作处理
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/notice")
+public class SysNoticeController extends BaseController {
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    /**
+     * 获取通知公告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysNotice notice) {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据通知公告编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    @GetMapping(value = "/{noticeId}")
+    public AjaxResult getInfo(@PathVariable Long noticeId) {
+        return success(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    @Log(title = "通知公告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysNotice notice) {
+        notice.setCreateByUserId(getUserId());
+        notice.setCreateBy(getLoginUser().getUser().getNickName());
+        return toAjax(noticeService.insertNotice(notice));
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
+        notice.setUpdateByUserId(getUserId());
+        notice.setUpdateBy(getLoginUser().getUser().getNickName());
+        return toAjax(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 删除通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    @Log(title = "通知公告", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{noticeIds}")
+    public AjaxResult remove(@PathVariable Long[] noticeIds) {
+        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysPostController.java

@@ -0,0 +1,136 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.system.domain.SysPost;
+import com.sundot.airport.system.service.ISysPostService;
+
+/**
+ * 岗位信息操作处理
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/post")
+public class SysPostController extends BaseController {
+    @Autowired
+    private ISysPostService postService;
+
+    /**
+     * 获取岗位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysPost post) {
+        startPage();
+        List<SysPost> list = postService.selectPostList(post);
+        return getDataTable(list);
+    }
+
+    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysPost post) {
+        List<SysPost> list = postService.selectPostList(post);
+        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+        util.exportExcel(response, list, "岗位数据");
+    }
+
+    /**
+     * 根据岗位编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:query')")
+    @GetMapping(value = "/{postId}")
+    public AjaxResult getInfo(@PathVariable Long postId) {
+        return success(postService.selectPostById(postId));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:add')")
+    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysPost post) {
+        if (!postService.checkPostNameUnique(post)) {
+            return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        } else if (!postService.checkPostCodeUnique(post)) {
+            return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        post.setCreateBy(getUsername());
+        return toAjax(postService.insertPost(post));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysPost post) {
+        if (!postService.checkPostNameUnique(post)) {
+            return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        } else if (!postService.checkPostCodeUnique(post)) {
+            return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        post.setUpdateBy(getUsername());
+        return toAjax(postService.updatePost(post));
+    }
+
+    /**
+     * 删除岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:remove')")
+    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{postIds}")
+    public AjaxResult remove(@PathVariable Long[] postIds) {
+        return toAjax(postService.deletePostByIds(postIds));
+    }
+
+    /**
+     * 获取岗位选择框列表
+     */
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect() {
+        List<SysPost> posts = postService.selectPostAll();
+        return success(posts);
+    }
+
+    /**
+     * 获取所有岗位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(SysPost post) {
+        List<SysPost> list = postService.selectPostList(post);
+        return success(list);
+    }
+
+    /**
+     * 查询岗位信息集合树形结构
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @GetMapping("/listAllTree")
+    public AjaxResult listAllTree(SysPost post) {
+        List<SysPost> list = postService.selectPostListTree(post);
+        return success(list);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysProfileController.java

@@ -0,0 +1,148 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.config.RuoYiConfig;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.common.utils.file.FileUploadUtils;
+import com.sundot.airport.common.utils.file.FileUtils;
+import com.sundot.airport.common.utils.file.MimeTypeUtils;
+import com.sundot.airport.framework.web.service.TokenService;
+import com.sundot.airport.system.service.ISysUserService;
+
+/**
+ * 个人信息 业务处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user/profile")
+public class SysProfileController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping
+    public AjaxResult profile()
+    {
+        LoginUser loginUser = getLoginUser();
+        SysUser user = loginUser.getUser();
+        AjaxResult ajax = AjaxResult.success(user);
+        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+        return ajax;
+    }
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult updateProfile(@RequestBody SysUser user)
+    {
+        LoginUser loginUser = getLoginUser();
+        SysUser currentUser = loginUser.getUser();
+        currentUser.setNickName(user.getNickName());
+        currentUser.setEmail(user.getEmail());
+        currentUser.setPhonenumber(user.getPhonenumber());
+        currentUser.setSex(user.getSex());
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
+        {
+            return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在");
+        }
+        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
+        {
+            return error("修改用户'" + loginUser.getUsername() + "'失败，邮箱账号已存在");
+        }
+        if (userService.updateUserProfile(currentUser) > 0)
+        {
+            // 更新缓存用户信息
+            tokenService.setLoginUser(loginUser);
+            return success();
+        }
+        return error("修改个人信息异常，请联系管理员");
+    }
+
+    /**
+     * 重置密码
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePwd")
+    public AjaxResult updatePwd(@RequestBody Map<String, String> params)
+    {
+        String oldPassword = params.get("oldPassword");
+        String newPassword = params.get("newPassword");
+        LoginUser loginUser = getLoginUser();
+        Long userId = loginUser.getUserId();
+        String password = loginUser.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return error("修改密码失败，旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return error("新密码不能与旧密码相同");
+        }
+        newPassword = SecurityUtils.encryptPassword(newPassword);
+        if (userService.resetUserPwd(userId, newPassword) > 0)
+        {
+            // 更新缓存用户密码&密码最后更新时间
+            loginUser.getUser().setPwdUpdateDate(DateUtils.getNowDate());
+            loginUser.getUser().setPassword(newPassword);
+            tokenService.setLoginUser(loginUser);
+            return success();
+        }
+        return error("修改密码异常，请联系管理员");
+    }
+
+    /**
+     * 头像上传
+     */
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping("/avatar")
+    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
+    {
+        if (!file.isEmpty())
+        {
+            LoginUser loginUser = getLoginUser();
+            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true);
+            if (userService.updateUserAvatar(loginUser.getUserId(), avatar))
+            {
+                String oldAvatar = loginUser.getUser().getAvatar();
+                if (StringUtils.isNotEmpty(oldAvatar))
+                {
+                    FileUtils.deleteFile(RuoYiConfig.getProfile() + FileUtils.stripPrefix(oldAvatar));
+                }
+                AjaxResult ajax = AjaxResult.success();
+                ajax.put("imgUrl", avatar);
+                // 更新缓存用户头像
+                loginUser.getUser().setAvatar(avatar);
+                tokenService.setLoginUser(loginUser);
+                return ajax;
+            }
+        }
+        return error("上传图片异常，请联系管理员");
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysRegisterController.java

@@ -0,0 +1,38 @@
+package com.sundot.airport.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.model.RegisterBody;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.framework.web.service.SysRegisterService;
+import com.sundot.airport.system.service.ISysConfigService;
+
+/**
+ * 注册验证
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class SysRegisterController extends BaseController
+{
+    @Autowired
+    private SysRegisterService registerService;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    @PostMapping("/register")
+    public AjaxResult register(@RequestBody RegisterBody user)
+    {
+        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
+        {
+            return error("当前系统没有开启注册功能！");
+        }
+        String msg = registerService.register(user);
+        return StringUtils.isEmpty(msg) ? success() : error(msg);
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysRoleController.java

@@ -0,0 +1,239 @@
+package com.sundot.airport.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.core.domain.model.LoginUser;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.framework.web.service.SysPermissionService;
+import com.sundot.airport.framework.web.service.TokenService;
+import com.sundot.airport.system.domain.SysUserRole;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysRoleService;
+import com.sundot.airport.system.service.ISysUserService;
+
+/**
+ * 角色信息
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/role")
+public class SysRoleController extends BaseController {
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysRole role) {
+        startPage();
+        List<SysRole> list = roleService.selectRoleList(role);
+        return getDataTable(list);
+    }
+
+    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysRole role) {
+        List<SysRole> list = roleService.selectRoleList(role);
+        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+        util.exportExcel(response, list, "角色数据");
+    }
+
+    /**
+     * 根据角色编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable Long roleId) {
+        roleService.checkRoleDataScope(roleId);
+        return success(roleService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysRole role) {
+        if (!roleService.checkRoleNameUnique(role)) {
+            return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        } else if (!roleService.checkRoleKeyUnique(role)) {
+            return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setCreateBy(getUsername());
+        return toAjax(roleService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysRole role) {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        if (!roleService.checkRoleNameUnique(role)) {
+            return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        } else if (!roleService.checkRoleKeyUnique(role)) {
+            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setUpdateBy(getUsername());
+
+        if (roleService.updateRole(role) > 0) {
+            // 更新缓存用户权限
+            LoginUser loginUser = getLoginUser();
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
+                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+                tokenService.setLoginUser(loginUser);
+            }
+            return success();
+        }
+        return error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/dataScope")
+    public AjaxResult dataScope(@RequestBody SysRole role) {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        return toAjax(roleService.authDataScope(role));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysRole role) {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        role.setUpdateBy(getUsername());
+        return toAjax(roleService.updateRoleStatus(role));
+    }
+
+    /**
+     * 删除角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public AjaxResult remove(@PathVariable Long[] roleIds) {
+        return toAjax(roleService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect() {
+        return success(roleService.selectRoleAll());
+    }
+
+    /**
+     * 查询已分配用户角色列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/authUser/allocatedList")
+    public TableDataInfo allocatedList(SysUser user) {
+        startPage();
+        List<SysUser> list = userService.selectAllocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询未分配用户角色列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/authUser/unallocatedList")
+    public TableDataInfo unallocatedList(SysUser user) {
+        startPage();
+        List<SysUser> list = userService.selectUnallocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 取消授权用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancel")
+    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) {
+        return toAjax(roleService.deleteAuthUser(userRole));
+    }
+
+    /**
+     * 批量取消授权用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancelAll")
+    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) {
+        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 批量选择用户授权
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/selectAll")
+    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) {
+        roleService.checkRoleDataScope(roleId);
+        return toAjax(roleService.insertAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 获取对应角色部门树列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping(value = "/deptTree/{roleId}")
+    public AjaxResult deptTree(@PathVariable("roleId") Long roleId) {
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+        ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
+        return ajax;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUsageReportController.java

@@ -0,0 +1,264 @@
+package com.sundot.airport.web.controller.system;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.attendance.domain.AttendanceRecord;
+import com.sundot.airport.attendance.service.IAttendanceRecordService;
+import com.sundot.airport.check.service.ICheckLargeScreenService;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.SysUsageReportDto;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.dto.BaseCommonDto;
+import com.sundot.airport.common.dto.QuizAccuracyAnalysisResultDto;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.DeptUtils;
+import com.sundot.airport.exam.dto.DashboardOverviewDTO;
+import com.sundot.airport.exam.dto.DashboardQueryDTO;
+import com.sundot.airport.exam.dto.DashboardUserRankingDTO;
+import com.sundot.airport.exam.service.IAccuracyStatisticsService;
+import com.sundot.airport.exam.service.IDashboardService;
+import com.sundot.airport.item.service.ItemLargeScreenService;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysUserService;
+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.math.BigDecimal;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 使用报告
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/usageReport")
+public class SysUsageReportController extends BaseController {
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private ICheckLargeScreenService checkLargeScreenService;
+
+    @Autowired
+    private ItemLargeScreenService itemLargeScreenService;
+
+    @Autowired
+    private IAttendanceRecordService attendanceRecordService;
+
+    @Autowired
+    private IDashboardService dashboardService;
+
+    @Autowired
+    private IAccuracyStatisticsService accuracyStatisticsService;
+
+    /**
+     * 使用报告
+     */
+    @GetMapping("/report")
+    public AjaxResult checkAnalysisReportCheckProblemDistributionDto(BaseLargeScreenQueryParamDto paramDto) {
+        SysUsageReportDto result = getSysUsageReportDto(paramDto);
+        return success(result);
+    }
+
+    /**
+     * 获取使用报告
+     */
+    private SysUsageReportDto getSysUsageReportDto(BaseLargeScreenQueryParamDto paramDto) {
+        if (ObjectUtil.isNull(paramDto.getStartDate()) || ObjectUtil.isNull(paramDto.getEndDate())) {
+            Date lastMonday = getLastWeekMonday();
+            Date lastSunday = getLastWeekSunday();
+            paramDto.setStartDate(lastMonday);
+            paramDto.setEndDate(lastSunday);
+        }
+        SysUsageReportDto result = new SysUsageReportDto();
+        result.setStartDate(paramDto.getStartDate());
+        result.setEndDate(paramDto.getEndDate());
+        result.setBasicSituation(getBasicSituation(paramDto));
+        result.setRunSituation(getRunSituation(paramDto));
+        return result;
+    }
+
+    /**
+     * 获取上周周一的日期 (java.util.Date)
+     */
+    public static Date getLastWeekMonday() {
+        LocalDate today = LocalDate.now();
+        // 计算本周周一（ISO标准：周一为1，周日为7）
+        LocalDate mondayThisWeek = today.with(DayOfWeek.MONDAY);
+        // 上周周一 = 本周周一 - 7天
+        LocalDate lastMonday = mondayThisWeek.minusWeeks(1);
+
+        return convertToUtilDate(lastMonday);
+    }
+
+    /**
+     * 获取上周周日的日期 (java.util.Date)
+     */
+    public static Date getLastWeekSunday() {
+        LocalDate today = LocalDate.now();
+        // 计算本周周一
+        LocalDate mondayThisWeek = today.with(DayOfWeek.MONDAY);
+        // 上周周日 = 本周周一 - 1天
+        LocalDate lastSunday = mondayThisWeek.minusDays(1);
+
+        return convertToUtilDate(lastSunday);
+    }
+
+    /**
+     * 将LocalDate转换为java.util.Date
+     */
+    private static Date convertToUtilDate(LocalDate localDate) {
+        return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+    }
+
+    /**
+     * 获取基本情况
+     */
+    private SysUsageReportDto.BasicSituation getBasicSituation(BaseLargeScreenQueryParamDto paramDto) {
+        SysUsageReportDto.BasicSituation basicSituation = new SysUsageReportDto.BasicSituation();
+        List<SysUsageReportDto.SysDeptInfo> sysDeptInfoList = new ArrayList<>();
+        // 获取当前用户所在站点ID
+        Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+        if (ObjectUtil.isNull(topSiteId)) {
+            throw new ServiceException("无法找到有效的站点信息");
+        }
+        List<SysDept> deptList = sysDeptService.selectChildrenDeptById(topSiteId);
+        deptList = deptList.stream().filter(item -> StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), item.getDeptType())).collect(Collectors.toList());
+        deptList.forEach(item -> {
+            SysUsageReportDto.SysDeptInfo sysDeptInfo = new SysUsageReportDto.SysDeptInfo();
+            List<SysUser> sysUserList = sysUserService.selectUserByDeptId(item.getDeptId());
+//            List<SysUser> sysUserList = sysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()), item.getId());
+            sysDeptInfo.setDeptId(item.getDeptId());
+            sysDeptInfo.setDeptName(item.getDeptName());
+            sysDeptInfo.setPeopleNumber(sysUserList.size());
+            sysDeptInfoList.add(sysDeptInfo);
+        });
+        basicSituation.setSysDeptInfoList(sysDeptInfoList);
+        basicSituation.setSysDeptInfoListDesc(sysDeptInfoList.stream().map(SysUsageReportDto.SysDeptInfo::getDeptName).collect(Collectors.joining("、")));
+        basicSituation.setTotalPeopleNumber(sysDeptInfoList.stream().mapToInt(SysUsageReportDto.SysDeptInfo::getPeopleNumber).sum());
+        return basicSituation;
+    }
+
+    /**
+     * 获取运行情况
+     */
+    private SysUsageReportDto.RunSituation getRunSituation(BaseLargeScreenQueryParamDto paramDto) {
+        SysUsageReportDto.RunSituation runSituation = new SysUsageReportDto.RunSituation();
+        runSituation.setAttendanceModule(getAttendanceModule(paramDto));
+        runSituation.setSeizureModule(getSeizureModule(paramDto));
+        runSituation.setExamModule(getExamModule(paramDto));
+        runSituation.setCheckModule(getCheckModule(paramDto));
+        return runSituation;
+    }
+
+    /**
+     * 获取勤务模块
+     */
+    private SysUsageReportDto.AttendanceModule getAttendanceModule(BaseLargeScreenQueryParamDto paramDto) {
+        SysUsageReportDto.AttendanceModule attendanceModule = new SysUsageReportDto.AttendanceModule();
+        AttendanceRecord attendanceRecordReq = new AttendanceRecord();
+        attendanceRecordReq.setAttendanceDateStart(paramDto.getStartDate());
+        attendanceRecordReq.setAttendanceDateEnd(paramDto.getEndDate());
+        List<AttendanceRecord> attendanceRecordList = attendanceRecordService.selectAttendanceRecordList(attendanceRecordReq);
+        if (CollUtil.isEmpty(attendanceRecordList)) {
+            return null;
+        }
+        List<SysUsageReportDto.SysDeptInfo> sysDeptInfoList = new ArrayList<>();
+        attendanceRecordList.stream().filter(item -> StrUtil.isNotBlank(item.getBrigadeCode())).collect(Collectors.groupingBy(item -> item.getBrigadeCode() + "_" + item.getBrigadeName())).forEach((key, value) -> {
+            SysUsageReportDto.SysDeptInfo sysDeptInfo = new SysUsageReportDto.SysDeptInfo();
+            sysDeptInfo.setDeptId(Long.valueOf(key.split("_")[0]));
+            sysDeptInfo.setDeptName(key.split("_")[1]);
+            sysDeptInfo.setPeopleNumber((int) value.stream().map(AttendanceRecord::getUserId).distinct().count());
+            sysDeptInfoList.add(sysDeptInfo);
+        });
+        attendanceModule.setSysDeptInfoList(sysDeptInfoList);
+        attendanceModule.setSysDeptInfoListDesc(sysDeptInfoList.stream().map(item -> item.getDeptName() + item.getPeopleNumber() + "人").collect(Collectors.joining("、")));
+        attendanceModule.setTotalPeopleNumber(sysDeptInfoList.stream().mapToInt(SysUsageReportDto.SysDeptInfo::getPeopleNumber).sum());
+        return attendanceModule;
+    }
+
+    /**
+     * 获取查获模块
+     */
+    private SysUsageReportDto.SeizureModule getSeizureModule(BaseLargeScreenQueryParamDto paramDto) {
+        SysUsageReportDto.SeizureModule seizureModule = itemLargeScreenService.getSeizureModule(paramDto);
+        return seizureModule;
+    }
+
+    /**
+     * 获取抽问抽答模块
+     */
+    private SysUsageReportDto.ExamModule getExamModule(BaseLargeScreenQueryParamDto paramDto) {
+        SysUsageReportDto.ExamModule examModule = new SysUsageReportDto.ExamModule();
+
+        String startDateStr = DateUtil.format(paramDto.getStartDate(), DatePattern.NORM_DATE_PATTERN);
+        String endDateStr = DateUtil.format(paramDto.getEndDate(), DatePattern.NORM_DATE_PATTERN);
+
+        DashboardQueryDTO query = new DashboardQueryDTO();
+        query.setStartDate(startDateStr);
+        query.setEndDate(endDateStr);
+        query.setTimeRange("custom");
+
+        // 总项数、平均分
+        DashboardOverviewDTO overview = dashboardService.getOverview(query);
+        if (overview != null) {
+            examModule.setTotalItem(overview.getCompletedTasks() != null ? overview.getCompletedTasks().intValue() : 0);
+            examModule.setAverageScore(overview.getAvgScore() != null ? BigDecimal.valueOf(overview.getAvgScore()) : BigDecimal.ZERO);
+        }
+
+        // 参与人数（有完成任务的用户数）
+        List<DashboardUserRankingDTO> allUsers = dashboardService.getAllUsersRanking(query);
+        if (CollUtil.isNotEmpty(allUsers)) {
+            long participantCount = allUsers.stream()
+                    .filter(user -> user.getCompletedTasks() != null && user.getCompletedTasks() > 0)
+                    .count();
+            examModule.setTotalPeopleNumber((int) participantCount);
+        } else {
+            examModule.setTotalPeopleNumber(0);
+        }
+
+        // 各分类正确率列表
+        QuizAccuracyAnalysisResultDto accuracyAnalysis = accuracyStatisticsService.getQuizAccuracyAnalysis(startDateStr, endDateStr);
+        if (accuracyAnalysis != null && CollUtil.isNotEmpty(accuracyAnalysis.getCategoryList())) {
+            List<BaseCommonDto> typeList = accuracyAnalysis.getCategoryList().stream().map(item -> {
+                BaseCommonDto dto = new BaseCommonDto();
+                dto.setName(item.getCategoryName());
+                dto.setScale(item.getCorrectRate());
+                dto.setRemark(item.getLabel());
+                return dto;
+            }).collect(Collectors.toList());
+            examModule.setTypeList(typeList);
+        }
+
+        return examModule;
+    }
+
+    /**
+     * 获取巡检模块
+     */
+    private SysUsageReportDto.CheckModule getCheckModule(BaseLargeScreenQueryParamDto paramDto) {
+        SysUsageReportDto.CheckModule checkModule = checkLargeScreenService.getCheckModule(paramDto);
+        return checkModule;
+    }
+
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -0,0 +1,927 @@
+package com.sundot.airport.web.controller.system;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.sql.Date;
+import java.util.*;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sundot.airport.attendance.domain.portrait.WorkDateStats;
+import com.sundot.airport.attendance.domain.portrait.WorkHoursStats;
+import com.sundot.airport.check.domain.CheckLargeScreenCommonDto;
+import com.sundot.airport.check.domain.CheckLargeScreenCorrectionDto;
+import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
+import com.sundot.airport.common.core.domain.ResetUserPostDto;
+import com.sundot.airport.common.core.domain.ResetUserRoleDto;
+import com.sundot.airport.common.core.domain.SysLargeScreenWorkingPortraitDto;
+import com.sundot.airport.common.dto.SysUserConditionDto;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.exam.domain.DailyTask;
+import com.sundot.airport.attendance.portrait.AttendanceModuleIndicatorResult;
+import com.sundot.airport.check.service.ICheckLargeScreenService;
+import com.sundot.airport.common.constant.CacheConstants;
+import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
+import com.sundot.airport.common.core.domain.SysLargeScreenDetailDto;
+import com.sundot.airport.common.core.redis.RedisCache;
+import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
+import com.sundot.airport.common.domain.portrait.ModularIndicatorResult;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.enums.portrait.UserType;
+import com.sundot.airport.item.domain.portrait.ItemSeizureModuleIndicatorResult;
+import com.sundot.airport.item.domain.portrait.SeizureStats;
+import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
+import com.sundot.airport.system.domain.SysLargeScreenCooperationQueryParamDto;
+import com.sundot.airport.system.domain.portrait.IndicatorResult;
+import com.sundot.airport.system.domain.portrait.QualificationStats;
+import com.sundot.airport.system.domain.portrait.WorkExperienceStats;
+import com.sundot.airport.system.service.ISysLearningGrowthService;
+import com.sundot.airport.system.service.portrait.UserPortraitService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.constant.UserConstants;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysPostService;
+import com.sundot.airport.system.service.ISysRoleService;
+import com.sundot.airport.system.service.ISysUserService;
+
+/**
+ * 用户信息
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user")
+public class SysUserController extends BaseController {
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Autowired
+    private ISysPostService postService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @Autowired
+    private ICheckLargeScreenService checkLargeScreenService;
+
+    @Autowired
+    private ISysLearningGrowthService sysLearningGrowthService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
+    @Autowired
+    private UserPortraitService userPortraitService;
+
+    @Autowired
+    private com.sundot.airport.exam.mapper.DailyTaskMapper dailyTaskMapper;
+
+    /**
+     * 获取用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysUser user) {
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return getDataTable(list);
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysUser user) {
+        List<SysUser> list = userService.selectUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        util.exportExcel(response, list, "用户数据");
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        List<SysUser> userList = util.importExcel(file.getInputStream(), 1);
+        String operName = getUsername();
+        String message = userService.importUser(userList, updateSupport, operName);
+        return success(message);
+    }
+
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        List<SysDept> deptList = deptService.selectDeptList(new SysDept());
+        ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
+        util.exportTemplateWithDeptRef(response, deptList, "用户数据导入模板.xlsx");
+    }
+
+    /**
+     * 查询用户列表
+     */
+    @PostMapping("/selectUserListByCondition")
+    public AjaxResult selectUserListByCondition(@RequestBody SysUserConditionDto dto) {
+        List<SysUser> result = userService.selectUserListByDeptIdAndRoleKeyListAndUserName(dto);
+        return success(result);
+    }
+
+    /**
+     * 能力画像-协同配合
+     */
+    @Cacheable(
+            value = "statistics_data",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/cooperation")
+    public AjaxResult cooperation(SysLargeScreenCooperationQueryParamDto dto) {
+        SysLargeScreenCooperationDto sysLargeScreenCooperationDto = userService.cooperation(dto);
+        return success(sysLargeScreenCooperationDto);
+    }
+
+    /**
+     * 能力画像-总体概览
+     */
+    @Cacheable(
+            value = "statistics_data",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/population")
+    public AjaxResult population(BaseLargeScreenQueryParamDto dto) {
+        // 默认查询当前登录用户的数据
+        if (ObjectUtil.isNull(dto.getUserId()) && ObjectUtil.isNull(dto.getDeptId())) {
+            dto.setUserId(getUserId());
+        }
+        // 传入的用户角色为部门管理员时，则查询部门数据。其中班组长不做处理，由前端处理
+        if (Objects.nonNull(dto.getUserId())) {
+            SysUser sysUser = userService.selectUserById(dto.getUserId());
+            List<SysRole> roles = sysUser.getRoles();
+            if (CollUtil.isNotEmpty(roles)) {
+                List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+                if (roleKeyList.contains(RoleTypeEnum.admin.getCode()) || roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode()) || roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode()) || roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
+                    dto.setUserId(null);
+                    dto.setDeptId(sysUser.getDeptId());
+                }
+            }
+        }
+
+        // 返回结果
+        SysLargeScreenDetailDto result = new SysLargeScreenDetailDto();
+        IndicatorCalculateParams indicatorCalculateParams = this.appendParams(dto);
+        if (Objects.nonNull(dto.getDeptId())) {
+            SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
+            if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.TEAMS.getCode(), sysDept.getDeptType())) {
+                indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) ? UserType.STATION : StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) ? UserType.BRIGADE : StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType()) ? UserType.DEPARTMENT : UserType.TEAM);
+                List<SysUser> sysUsers = iSysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()), dto.getDeptId());
+                indicatorCalculateParams.setUserIds(sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList()));
+                indicatorCalculateParams.setDeptId(dto.getDeptId());
+            }
+        } else {
+            indicatorCalculateParams.setUserType(UserType.PERSONAL);
+            indicatorCalculateParams.setUserId(dto.getUserId());
+        }
+
+        // 巡检问题总次数
+        result.setCheckCount(checkLargeScreenService.population(dto));
+        // 学习成长平均分
+        result.setLearningGrowthScore(sysLearningGrowthService.population(dto));
+        // 工作风格
+        result.setWorkingStyle(userService.getWorkingStyle(dto));
+        // 主观印象
+        result.setSubjectiveImpression(userService.getSubjectiveImpression(dto));
+        // 测试平均分（抽问抽答）
+        result.setTestScore(calculatePopulationTestScore(dto));
+
+        //工作产出(有效查获数量)
+        this.avgSeizureCount(indicatorCalculateParams, result);
+        // 资质等级
+        this.qualificationLevel(indicatorCalculateParams, result);
+        // 工作履历（安检工作年限）
+        this.workingYears(indicatorCalculateParams, result);
+        // 出勤投入(上岗时长)
+        this.avgWorkingHours(indicatorCalculateParams, result);
+
+        return success(result);
+    }
+
+    /**
+     * 能力画像-明细
+     */
+    @Cacheable(
+            value = "statistics_list",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/detail")
+    public AjaxResult detail(BaseLargeScreenQueryParamDto dto) {
+        // 判空处理
+        if (ObjectUtil.isNull(dto.getDeptId())) {
+            dto.setDeptId(getDeptId());
+        }
+        if (ObjectUtil.isNull(dto.getDeptId())) {
+            return error("部门ID不能为空");
+        }
+
+        IndicatorCalculateParams indicatorCalculateParams = this.appendParams(dto);
+
+        // 返回结果
+        List<SysLargeScreenDetailDto> result = new ArrayList<>();
+
+        // 人均巡检问题数
+        List<SysLargeScreenDetailDto> checkList = checkLargeScreenService.detail(dto);
+        Map<Long, BigDecimal> checkCountMap = checkList.stream().collect(Collectors.toMap(SysLargeScreenDetailDto::getId, SysLargeScreenDetailDto::getCheckCount, (oldValue, newValue) -> newValue));
+
+        // 返回结果处理
+        SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
+        if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
+            indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) ? UserType.BRIGADE : StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) ? UserType.DEPARTMENT : UserType.TEAM);
+            SysDept temp = new SysDept();
+            temp.setParentId(dto.getDeptId());
+            List<SysDept> deptList = deptService.selectDeptInfoAll(temp);
+            deptList.forEach(item -> {
+                SysLargeScreenDetailDto resultItem = new SysLargeScreenDetailDto();
+                resultItem.setId(item.getDeptId());
+                resultItem.setName(item.getDeptName());
+                resultItem.setCheckCount(checkCountMap.getOrDefault(item.getDeptId(), BigDecimal.ZERO));
+                //获取指标
+                indicatorCalculateParams.setDeptId(item.getDeptId());
+                List<SysUser> sysUsers = iSysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()), item.getDeptId());
+                indicatorCalculateParams.setUserIds(sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList()));
+                this.qualificationLevel(indicatorCalculateParams, resultItem);
+                this.avgSeizureCount(indicatorCalculateParams, resultItem);
+                this.avgWorkingDays(indicatorCalculateParams, resultItem);
+                this.avgWorkingHours(indicatorCalculateParams, resultItem);
+                this.avgTestScore(indicatorCalculateParams, resultItem);
+                result.add(resultItem);
+            });
+        } else if (StrUtil.equals(DeptTypeEnum.TEAMS.getCode(), sysDept.getDeptType())) {
+            indicatorCalculateParams.setUserType(UserType.PERSONAL);
+            List<SysUser> sysUsers = iSysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()), dto.getDeptId());
+            sysUsers.forEach(item -> {
+                SysLargeScreenDetailDto resultItem = new SysLargeScreenDetailDto();
+                resultItem.setId(item.getUserId());
+                resultItem.setName(item.getNickName());
+                resultItem.setCheckCount(checkCountMap.getOrDefault(item.getUserId(), BigDecimal.ZERO));
+                //获取指标
+                indicatorCalculateParams.setUserId(item.getUserId());
+                this.qualificationLevel(indicatorCalculateParams, resultItem);
+                this.avgSeizureCount(indicatorCalculateParams, resultItem);
+                this.avgWorkingDays(indicatorCalculateParams, resultItem);
+                this.avgWorkingHours(indicatorCalculateParams, resultItem);
+                this.avgTestScore(indicatorCalculateParams, resultItem);
+                result.add(resultItem);
+            });
+        } else {
+            return error("部门类型数据错误");
+        }
+
+        return success(result);
+    }
+
+    /**
+     * 工作画像-总体概览
+     */
+    @Cacheable(
+            value = "statistics_data",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @GetMapping("/workingPortrait")
+    public AjaxResult workingPortrait(BaseLargeScreenQueryParamDto dto) {
+        // 返回结果
+        SysLargeScreenWorkingPortraitDto result = new SysLargeScreenWorkingPortraitDto();
+
+        // 工作产出和管理推动查询条件
+        CheckLargeScreenCorrectionQueryParamDto checkQueryParam = new CheckLargeScreenCorrectionQueryParamDto();
+        checkQueryParam.setDeptId(dto.getDeptId());
+        checkQueryParam.setStartDate(dto.getStartDate());
+        checkQueryParam.setEndDate(dto.getEndDate());
+        checkQueryParam.setSpecifiedDate(dto.getSpecifiedDate());
+        checkQueryParam.setProcessStatus("3");//ProcessStatusEnum.ARCHIVED.getCode()-归档
+        // 工作产出
+        List<CheckLargeScreenCommonDto> workOutputCheckList = checkLargeScreenService.workOutputCheck(checkQueryParam);
+        result.setWorkOutput(workOutputCheckList.stream().map(CheckLargeScreenCommonDto::getTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
+        // 管理推动
+        CheckLargeScreenCorrectionDto checkLargeScreenCorrectionDto = checkLargeScreenService.managementPromotionCorrection(checkQueryParam);
+        result.setManagementPromotion(checkLargeScreenCorrectionDto.getOverTimeCompletedCount().add(checkLargeScreenCorrectionDto.getOverTimeUnfinishedCount()));
+        //在岗时长
+        SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
+        IndicatorCalculateParams indicatorCalculateParams = this.appendParams(dto);
+        indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) ? UserType.STATION : UserType.BRIGADE);
+        indicatorCalculateParams.setDeptId(dto.getDeptId());
+        List<SysUser> sysUsers = iSysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()), dto.getDeptId());
+        indicatorCalculateParams.setUserIds(sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList()));
+        SysLargeScreenDetailDto detail = new SysLargeScreenDetailDto();
+        this.avgWorkingHours(indicatorCalculateParams, detail);
+        result.setAvgWorkingHours(detail.getAvgWorkingHours());
+        return success(result);
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping(value = {"/", "/{userId}"})
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+        AjaxResult ajax = AjaxResult.success();
+        if (StringUtils.isNotNull(userId)) {
+            userService.checkUserDataScope(userId);
+            SysUser sysUser = userService.selectUserById(userId);
+            if (StringUtils.isNotEmpty(sysUser.getTeamCooperation())) {
+                List<Long> list = Arrays.stream(sysUser.getTeamCooperation().split(",")).map(Long::valueOf).collect(Collectors.toList());
+                sysUser.setTeamCooperationList(userService.selectByUserIdList(list));
+            }
+            ajax.put(AjaxResult.DATA_TAG, sysUser);
+            ajax.put("postIds", postService.selectPostListByUserId(userId));
+            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+        }
+        List<SysRole> roles = roleService.selectRoleAll();
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("posts", postService.selectPostAll());
+        return ajax;
+    }
+
+    /**
+     * 新增用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysUser user) {
+        deptService.checkDeptDataScope(user.getDeptId());
+        roleService.checkRoleDataScope(user.getRoleIds());
+        if (!userService.checkUserNameUnique(user)) {
+            return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+            return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setCreateBy(getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        return toAjax(userService.insertUser(user));
+    }
+
+    /**
+     * 修改用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysUser user) {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        deptService.checkDeptDataScope(user.getDeptId());
+        roleService.checkRoleDataScope(user.getRoleIds());
+        if (!userService.checkUserNameUnique(user)) {
+            return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+            return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setUpdateBy(getUsername());
+        redisCache.expire(CacheConstants.USER_INFO_KEY + user.getUserId(), 0);
+        redisCache.expire(CacheConstants.USER_INFO_KEY + user.getUserName(), 0);
+        return toAjax(userService.updateUser(user));
+    }
+
+    /**
+     * 删除用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds) {
+        if (ArrayUtils.contains(userIds, getUserId())) {
+            return error("当前用户不能删除");
+        }
+        return toAjax(userService.deleteUserByIds(userIds));
+    }
+
+    /**
+     * 重置密码
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetPwd")
+    public AjaxResult resetPwd(@RequestBody SysUser user) {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.resetPwd(user));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysUser user) {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.updateUserStatus(user));
+    }
+
+    /**
+     * 根据用户编号获取授权角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/authRole/{userId}")
+    public AjaxResult authRole(@PathVariable("userId") Long userId) {
+        AjaxResult ajax = AjaxResult.success();
+        SysUser user = userService.selectUserById(userId);
+        List<SysRole> roles = roleService.selectRolesByUserId(userId);
+        ajax.put("user", user);
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        redisCache.expire(CacheConstants.USER_INFO_KEY + user.getUserId(), 0);
+        redisCache.expire(CacheConstants.USER_INFO_KEY + user.getUserName(), 0);
+        return ajax;
+    }
+
+    /**
+     * 用户授权角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authRole")
+    public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
+        userService.checkUserDataScope(userId);
+        roleService.checkRoleDataScope(roleIds);
+        userService.insertUserAuth(userId, roleIds);
+        redisCache.expire(CacheConstants.USER_INFO_KEY + userId, 0);
+        return success();
+    }
+
+    /**
+     * 获取部门树列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/deptTree")
+    public AjaxResult deptTree(SysDept dept) {
+        return success(deptService.selectDeptTreeList(dept));
+    }
+
+    /**
+     * 获取部门及用户树列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/deptUserTree")
+    public AjaxResult deptUserTree(SysDept dept) {
+        return success(deptService.selectDeptUserTreeList(dept));
+    }
+
+    /**
+     * 获取全部用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(SysUser user) {
+        List<SysUser> list = userService.selectUserList(user);
+        return success(list);
+    }
+
+    /**
+     * 通过用户ID查询用户各级领导
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/selectDeptLeaderByUserId")
+    public AjaxResult selectDeptLeaderByUserId(@RequestParam("userId") Long userId, @RequestParam("deptType") String deptType) {
+        return AjaxResult.success(userService.selectDeptLeaderByUserId(userId, deptType));
+    }
+
+    /**
+     * 重置班组长和安检员的岗位为旅检的所有二级岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "重置班组长和安检员的岗位为旅检的所有二级岗位", businessType = BusinessType.UPDATE)
+    @GetMapping("/resetUserPost")
+    public AjaxResult resetUserPost() {
+        return toAjax(userService.resetUserPost());
+    }
+
+    /**
+     * 重置指定部门中指定角色的人员的指定岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "重置指定部门中指定角色的人员的指定岗位", businessType = BusinessType.UPDATE)
+    @PostMapping("/resetUserPostByDept")
+    public AjaxResult resetUserPostByDept(@RequestBody ResetUserPostDto resetUserPostDto) {
+        return toAjax(userService.resetUserPostByDept(resetUserPostDto));
+    }
+
+    /**
+     * 重置指定人员的指定角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "重置指定人员的指定角色", businessType = BusinessType.UPDATE)
+    @PostMapping("/resetUserRole")
+    public AjaxResult resetUserRole(@RequestBody ResetUserRoleDto resetUserRoleDto) {
+        return toAjax(userService.resetUserRole(resetUserRoleDto));
+    }
+
+    /**
+     * 根据用户ID获取岗位选择框列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping(value = {"/getPostListsByUserId/{userId}"})
+    public AjaxResult getPostListsByUserId(@PathVariable("userId") Long userId) {
+        return AjaxResult.success(postService.selectPostListsByUserId(userId));
+    }
+
+    /**
+     * 获取用户画像-指标
+     *
+     * @return
+     */
+    private IndicatorCalculateParams appendParams(BaseLargeScreenQueryParamDto dto) {
+        IndicatorCalculateParams params = new IndicatorCalculateParams();
+        params.setIndicatorTypes(Arrays.asList("qualificationLevel", "workingDate", "workingHours", "effectiveSeizureCount", "workYears", "securityWorkYears"));
+        // 设置默认时间范围
+        java.util.Date endTime = Optional.ofNullable(dto.getEndDate()).orElse(new java.util.Date());
+        java.util.Date startTime = Optional.ofNullable(dto.getStartDate())
+                .orElse(java.util.Date.from(endTime.toInstant().minusSeconds(7862400L))); // 91天
+
+        params.setStartTime(startTime);
+        params.setEndTime(endTime);
+        return params;
+    }
+
+    /**
+     * 获取平均查获数量
+     *
+     * @param params
+     * @param detail
+     */
+    private void avgSeizureCount(IndicatorCalculateParams params, SysLargeScreenDetailDto detail) {
+        ModularIndicatorResult indicators = userPortraitService.getIndicators(params, Arrays.asList("item"));
+        if (indicators == null) {
+            detail.setAvgSeizureCount(BigDecimal.ZERO);
+            return;
+        }
+
+        ItemSeizureModuleIndicatorResult itemResult = (ItemSeizureModuleIndicatorResult) indicators.getModuleResult("item");
+        if (itemResult == null) {
+            detail.setAvgSeizureCount(BigDecimal.ZERO);
+            return;
+        }
+
+        if (UserType.PERSONAL.equals(params.getUserType())) {
+            detail.setAvgSeizureCount(itemResult.getEffectiveSeizureCount() != null ?
+                    new BigDecimal(itemResult.getEffectiveSeizureCount().toString()) : BigDecimal.ZERO);
+        } else {
+            Object effectiveSeizureCount = itemResult.getEffectiveSeizureCount();
+            if (effectiveSeizureCount instanceof SeizureStats) {
+                SeizureStats seizureStats = (SeizureStats) effectiveSeizureCount;
+                if (seizureStats.getTotalCount() != 0) {
+                    detail.setAvgSeizureCount(new BigDecimal(seizureStats.getTotalCount()));
+                } else {
+                    detail.setAvgSeizureCount(BigDecimal.ZERO);
+                }
+            } else {
+                detail.setAvgSeizureCount(BigDecimal.ZERO);
+            }
+        }
+    }
+
+    /**
+     * 获取平均上岗时长
+     *
+     * @param params
+     * @param detail
+     */
+    private void avgWorkingHours(IndicatorCalculateParams params, SysLargeScreenDetailDto detail) {
+        ModularIndicatorResult indicators = userPortraitService.getIndicators(params, Arrays.asList("attendance"));
+        if (indicators == null) {
+            detail.setAvgWorkingHours(BigDecimal.ZERO);
+            return;
+        }
+
+        AttendanceModuleIndicatorResult attendanceResult = (AttendanceModuleIndicatorResult) indicators.getModuleResult("attendance");
+        if (attendanceResult == null) {
+            detail.setAvgWorkingHours(BigDecimal.ZERO);
+            return;
+        }
+
+        if (UserType.PERSONAL.equals(params.getUserType())) {
+            detail.setAvgWorkingHours(attendanceResult.getWorkingHours() != null ?
+                    new BigDecimal(attendanceResult.getWorkingHours().toString()) : BigDecimal.ZERO);
+        } else {
+            Object workingHours = attendanceResult.getWorkingHours();
+            if (workingHours instanceof WorkHoursStats) {
+                WorkHoursStats workHoursStats = (WorkHoursStats) workingHours;
+                detail.setAvgWorkingHours(workHoursStats.getAveragePersonnel() != null ?
+                        workHoursStats.getAveragePersonnel() : BigDecimal.ZERO);
+            } else {
+                detail.setAvgWorkingHours(BigDecimal.ZERO);
+            }
+        }
+    }
+
+    /**
+     * 获取平均出勤天数
+     *
+     * @param params
+     * @param detail
+     */
+    private void avgWorkingDays(IndicatorCalculateParams params, SysLargeScreenDetailDto detail) {
+        ModularIndicatorResult indicators = userPortraitService.getIndicators(params, Arrays.asList("attendance"));
+        if (indicators == null) {
+            detail.setAvgWorkingDays(BigDecimal.ZERO);
+            return;
+        }
+
+        AttendanceModuleIndicatorResult attendanceResult = (AttendanceModuleIndicatorResult) indicators.getModuleResult("attendance");
+        if (attendanceResult == null) {
+            detail.setAvgWorkingDays(BigDecimal.ZERO);
+            return;
+        }
+
+        if (UserType.PERSONAL.equals(params.getUserType())) {
+            detail.setAvgWorkingDays(attendanceResult.getWorkingDate() != null ?
+                    new BigDecimal(attendanceResult.getWorkingDate().toString()) : BigDecimal.ZERO);
+        } else {
+            Object workingDate = attendanceResult.getWorkingDate();
+            if (workingDate instanceof WorkDateStats) {
+                WorkDateStats workDateStats = (WorkDateStats) workingDate;
+                detail.setAvgWorkingDays(workDateStats.getAveragePersonnel() != null ?
+                        workDateStats.getAveragePersonnel() : BigDecimal.ZERO);
+            } else {
+                detail.setAvgWorkingDays(BigDecimal.ZERO);
+            }
+        }
+    }
+
+    /**
+     * 获取资质等级
+     *
+     * @param params
+     * @param detail
+     */
+    private void qualificationLevel(IndicatorCalculateParams params, SysLargeScreenDetailDto detail) {
+        ModularIndicatorResult indicators = userPortraitService.getIndicators(params, Arrays.asList("system"));
+        if (indicators == null) {
+            detail.setQualificationLevel("0");
+            return;
+        }
+
+        IndicatorResult systemResult = (IndicatorResult) indicators.getModuleResult("system");
+        if (systemResult == null) {
+            detail.setQualificationLevel("0");
+            return;
+        }
+
+        if (UserType.PERSONAL.equals(params.getUserType())) {
+            String qualificationLevel = systemResult.getQualificationLevel();
+            detail.setQualificationLevel(qualificationLevel != null ? qualificationLevel : "0");
+        } else {
+            List<QualificationStats> qualificationLevelStats = systemResult.getQualificationLevelStats();
+            if (qualificationLevelStats != null) {
+                final String FIRST_LEVEL = "高级";
+                Integer reduce = qualificationLevelStats.stream()
+                        .filter(qualificationStats -> FIRST_LEVEL.equals(qualificationStats.getLevelName()))
+                        .map(QualificationStats::getCount)
+                        .reduce(0, Integer::sum);
+                detail.setQualificationLevel(reduce.toString());
+            } else {
+                detail.setQualificationLevel("0");
+            }
+        }
+    }
+
+    /**
+     * 个人获取工作年限
+     */
+    private void workingYears(IndicatorCalculateParams params, SysLargeScreenDetailDto detail) {
+        ModularIndicatorResult indicators = userPortraitService.getIndicators(params, Arrays.asList("system"));
+        if (indicators == null) {
+            detail.setWorkYears(BigDecimal.ZERO);
+        }
+        IndicatorResult systemResult = (IndicatorResult) indicators.getModuleResult("system");
+        if (systemResult == null) {
+            detail.setWorkYears(BigDecimal.ZERO);
+            return;
+        }
+        if (UserType.PERSONAL.equals(params.getUserType())) {
+            Integer workYears = systemResult.getSecurityWorkYears();
+            detail.setWorkYears(workYears != null ? new BigDecimal(workYears) : BigDecimal.ZERO);
+        } else {
+            WorkExperienceStats securityWorkYearsStats = systemResult.getSecurityWorkYearsStats();
+            if (securityWorkYearsStats != null && securityWorkYearsStats.getAverageWorkYears() != null) {
+                detail.setWorkYears(BigDecimal.valueOf(securityWorkYearsStats.getAverageWorkYears()));
+            } else {
+                detail.setWorkYears(BigDecimal.ZERO);
+            }
+        }
+    }
+
+
+    /**
+     * 获取测试平均分
+     *
+     * @param params
+     * @param detail
+     */
+    private void avgTestScore(IndicatorCalculateParams params, SysLargeScreenDetailDto detail) {
+        java.util.Date startTime = params.getStartTime();
+        java.util.Date endTime = params.getEndTime();
+
+        // 根据用户类型查询
+        if (UserType.PERSONAL.equals(params.getUserType())) {
+            // 个人：查询该用户的平均分
+            Long userId = params.getUserId();
+            BigDecimal avgScore = calculateUserAvgScore(userId, startTime, endTime);
+            detail.setTestScore(avgScore);
+        } else {
+            // 组织：查询该部门下所有成员的平均分
+            Long deptId = params.getDeptId();
+            BigDecimal avgScore = calculateDeptAvgScore(deptId, startTime, endTime);
+            detail.setTestScore(avgScore);
+        }
+    }
+
+    /**
+     * 计算个人平均分
+     */
+    private BigDecimal calculateUserAvgScore(Long userId, java.util.Date startTime, java.util.Date endTime) {
+        LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DailyTask::getDtUserId, userId);
+        wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(
+                new java.text.SimpleDateFormat("yyyy-MM-dd").format(startTime)));
+        wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(
+                new java.text.SimpleDateFormat("yyyy-MM-dd").format(endTime)));
+        wrapper.in(DailyTask::getDtStatus, "COMPLETED", "EXPIRED");
+        wrapper.eq(DailyTask::getDelStatus, 0);
+
+        List<DailyTask> tasks = dailyTaskMapper.selectList(wrapper);
+
+        if (tasks.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+
+        BigDecimal totalScore = tasks.stream()
+                .map(task -> "EXPIRED".equals(task.getDtStatus()) ? BigDecimal.ZERO : task.getDtTotalScore())
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        return totalScore.divide(new BigDecimal(tasks.size()), 2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 计算部门平均分（所有成员的平均分）
+     */
+    private BigDecimal calculateDeptAvgScore(Long deptId, java.util.Date startTime, java.util.Date endTime) {
+        // 1. 获取部门下所有用户
+        List<SysUser> users = iSysUserService.selectUserByDeptId(deptId);
+
+        if (users.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+
+        // 2. 收集所有用户ID
+        List<Long> userIds = users.stream()
+                .map(SysUser::getUserId)
+                .collect(Collectors.toList());
+
+        // 3. 查询这些用户的所有任务
+        LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(DailyTask::getDtUserId, userIds);
+        wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(
+                new java.text.SimpleDateFormat("yyyy-MM-dd").format(startTime)));
+        wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(
+                new java.text.SimpleDateFormat("yyyy-MM-dd").format(endTime)));
+        wrapper.in(DailyTask::getDtStatus, "COMPLETED", "EXPIRED");
+        wrapper.eq(DailyTask::getDelStatus, 0);
+
+        List<DailyTask> tasks = dailyTaskMapper.selectList(wrapper);
+
+        if (tasks.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+
+        // 4. 计算所有任务的平均分
+        BigDecimal totalScore = tasks.stream()
+                .map(task -> "EXPIRED".equals(task.getDtStatus()) ? BigDecimal.ZERO : task.getDtTotalScore())
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        return totalScore.divide(new BigDecimal(tasks.size()), 2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 计算population接口的测试平均分
+     * 根据userId或deptId查询抽问抽答的平均分
+     */
+    private BigDecimal calculatePopulationTestScore(BaseLargeScreenQueryParamDto dto) {
+        // 设置时间范围
+        java.util.Date endTime = Optional.ofNullable(dto.getEndDate()).orElse(new java.util.Date());
+        java.util.Date startTime = Optional.ofNullable(dto.getStartDate())
+                .orElse(java.util.Date.from(endTime.toInstant().minusSeconds(7862400L))); // 91天
+
+        // 判断是个人还是部门
+        if (ObjectUtil.isNotNull(dto.getUserId())) {
+            // 个人维度：直接查询该用户的平均分
+            return calculateUserAvgScore(dto.getUserId(), startTime, endTime);
+        } else if (ObjectUtil.isNotNull(dto.getDeptId())) {
+            // 部门维度：查询该部门及所有下级部门的平均分
+            return calculateDeptAvgScoreByDeptId(dto.getDeptId(), startTime, endTime);
+        }
+
+        return BigDecimal.ZERO;
+    }
+
+    /**
+     * 根据部门ID计算平均分（基于dt_dept_id查询）
+     * 需要递归查找所有下级部门
+     */
+    private BigDecimal calculateDeptAvgScoreByDeptId(Long deptId, java.util.Date startTime, java.util.Date endTime) {
+        // 1. 获取该部门及所有下级部门的ID列表
+        List<Long> deptIds = getAllSubDeptIds(deptId);
+
+        if (deptIds.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+
+        // 2. 查询这些部门的所有任务（通过dt_dept_id）
+        LambdaQueryWrapper<DailyTask> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(DailyTask::getDtDeptId, deptIds);
+        wrapper.ge(DailyTask::getDtBusinessDate, Date.valueOf(
+                new java.text.SimpleDateFormat("yyyy-MM-dd").format(startTime)));
+        wrapper.le(DailyTask::getDtBusinessDate, Date.valueOf(
+                new java.text.SimpleDateFormat("yyyy-MM-dd").format(endTime)));
+        wrapper.in(DailyTask::getDtStatus, "COMPLETED", "EXPIRED");
+        wrapper.eq(DailyTask::getDelStatus, 0);
+
+        List<DailyTask> tasks = dailyTaskMapper.selectList(wrapper);
+
+        if (tasks.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+
+        // 3. 计算平均分（EXPIRED的任务分数算0）
+        BigDecimal totalScore = tasks.stream()
+                .map(task -> "EXPIRED".equals(task.getDtStatus()) ? BigDecimal.ZERO : task.getDtTotalScore())
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        return totalScore.divide(new BigDecimal(tasks.size()), 2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 获取指定部门及其所有下级部门的ID列表
+     * 根据sys_dept表的层级关系递归查找
+     */
+    private List<Long> getAllSubDeptIds(Long deptId) {
+        List<Long> result = new ArrayList<>();
+        result.add(deptId); // 包含自己
+
+        // 查询直接下级部门
+        SysDept queryDept = new SysDept();
+        queryDept.setParentId(deptId);
+        List<SysDept> subDepts = deptService.selectDeptInfoAll(queryDept);
+
+        // 递归查询所有下级部门
+        for (SysDept subDept : subDepts) {
+            if ("0".equals(subDept.getDelFlag())) { // 只包含未删除的部门
+                result.addAll(getAllSubDeptIds(subDept.getDeptId()));
+            }
+        }
+
+        return result;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysWorkingDocumentController.java

@@ -0,0 +1,102 @@
+package com.sundot.airport.web.controller.system;
+
+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;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.system.domain.SysWorkingDocument;
+import com.sundot.airport.system.service.ISysWorkingDocumentService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 工作文档Controller
+ *
+ * @author ruoyi
+ * @date 2025-11-18
+ */
+@RestController
+@RequestMapping("/system/workingDocument")
+public class SysWorkingDocumentController extends BaseController {
+    @Autowired
+    private ISysWorkingDocumentService sysWorkingDocumentService;
+
+    /**
+     * 查询工作文档列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:workingDocument:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysWorkingDocument sysWorkingDocument) {
+        startPage();
+        List<SysWorkingDocument> list = sysWorkingDocumentService.selectSysWorkingDocumentList(sysWorkingDocument);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出工作文档列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:workingDocument:export')")
+    @Log(title = "工作文档", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysWorkingDocument sysWorkingDocument) {
+        List<SysWorkingDocument> list = sysWorkingDocumentService.selectSysWorkingDocumentList(sysWorkingDocument);
+        ExcelUtil<SysWorkingDocument> util = new ExcelUtil<SysWorkingDocument>(SysWorkingDocument.class);
+        util.exportExcel(response, list, "工作文档数据");
+    }
+
+    /**
+     * 获取工作文档详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:workingDocument:query')")
+    @GetMapping(value = "/{documentId}")
+    public AjaxResult getInfo(@PathVariable("documentId") Long documentId) {
+        return success(sysWorkingDocumentService.selectSysWorkingDocumentByDocumentId(documentId));
+    }
+
+    /**
+     * 新增工作文档
+     */
+    @PreAuthorize("@ss.hasPermi('system:workingDocument:add')")
+    @Log(title = "工作文档", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysWorkingDocument sysWorkingDocument) {
+        sysWorkingDocument.setCreateByUserId(getUserId());
+        sysWorkingDocument.setCreateBy(getLoginUser().getUser().getNickName());
+        return toAjax(sysWorkingDocumentService.insertSysWorkingDocument(sysWorkingDocument));
+    }
+
+    /**
+     * 修改工作文档
+     */
+    @PreAuthorize("@ss.hasPermi('system:workingDocument:edit')")
+    @Log(title = "工作文档", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysWorkingDocument sysWorkingDocument) {
+        sysWorkingDocument.setUpdateByUserId(getUserId());
+        sysWorkingDocument.setUpdateBy(getLoginUser().getUser().getNickName());
+        return toAjax(sysWorkingDocumentService.updateSysWorkingDocument(sysWorkingDocument));
+    }
+
+    /**
+     * 删除工作文档
+     */
+    @PreAuthorize("@ss.hasPermi('system:workingDocument:remove')")
+    @Log(title = "工作文档", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{documentIds}")
+    public AjaxResult remove(@PathVariable Long[] documentIds) {
+        return toAjax(sysWorkingDocumentService.deleteSysWorkingDocumentByDocumentIds(documentIds));
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/tool/TestController.java

@@ -0,0 +1,183 @@
+package com.sundot.airport.web.controller.tool;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.R;
+import com.sundot.airport.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * swagger 用户测试方法
+ * 
+ * @author ruoyi
+ */
+@Api("用户信息管理")
+@RestController
+@RequestMapping("/test/user")
+public class TestController extends BaseController
+{
+    private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
+    {
+        users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
+        users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
+    }
+
+    @ApiOperation("获取用户列表")
+    @GetMapping("/list")
+    public R<List<UserEntity>> userList()
+    {
+        List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
+        return R.ok(userList);
+    }
+
+    @ApiOperation("获取用户详细")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+    @GetMapping("/{userId}")
+    public R<UserEntity> getUser(@PathVariable Integer userId)
+    {
+        if (!users.isEmpty() && users.containsKey(userId))
+        {
+            return R.ok(users.get(userId));
+        }
+        else
+        {
+            return R.fail("用户不存在");
+        }
+    }
+
+    @ApiOperation("新增用户")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class),
+        @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class)
+    })
+    @PostMapping("/save")
+    public R<String> save(UserEntity user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
+        {
+            return R.fail("用户ID不能为空");
+        }
+        users.put(user.getUserId(), user);
+        return R.ok();
+    }
+
+    @ApiOperation("更新用户")
+    @PutMapping("/update")
+    public R<String> update(@RequestBody UserEntity user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
+        {
+            return R.fail("用户ID不能为空");
+        }
+        if (users.isEmpty() || !users.containsKey(user.getUserId()))
+        {
+            return R.fail("用户不存在");
+        }
+        users.remove(user.getUserId());
+        users.put(user.getUserId(), user);
+        return R.ok();
+    }
+
+    @ApiOperation("删除用户信息")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+    @DeleteMapping("/{userId}")
+    public R<String> delete(@PathVariable Integer userId)
+    {
+        if (!users.isEmpty() && users.containsKey(userId))
+        {
+            users.remove(userId);
+            return R.ok();
+        }
+        else
+        {
+            return R.fail("用户不存在");
+        }
+    }
+}
+
+@ApiModel(value = "UserEntity", description = "用户实体")
+class UserEntity
+{
+    @ApiModelProperty("用户ID")
+    private Integer userId;
+
+    @ApiModelProperty("用户名称")
+    private String username;
+
+    @ApiModelProperty("用户密码")
+    private String password;
+
+    @ApiModelProperty("用户手机")
+    private String mobile;
+
+    public UserEntity()
+    {
+
+    }
+
+    public UserEntity(Integer userId, String username, String password, String mobile)
+    {
+        this.userId = userId;
+        this.username = username;
+        this.password = password;
+        this.mobile = mobile;
+    }
+
+    public Integer getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Integer userId)
+    {
+        this.userId = userId;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getMobile()
+    {
+        return mobile;
+    }
+
+    public void setMobile(String mobile)
+    {
+        this.mobile = mobile;
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/core/cache/UserCache.java

@@ -0,0 +1,100 @@
+package com.sundot.airport.web.core.cache;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.common.constant.CacheConstants;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.core.redis.RedisCache;
+import com.sundot.airport.common.dto.UserInfo;
+import com.sundot.airport.common.enums.DeptType;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysUserService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 用户信息缓存
+ *
+ * @Author: wangchong
+ * @Date: 2025/7/11 14:49
+ **/
+@Component
+public class UserCache {
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /**
+     * 获取用户信息
+     *
+     * @param userId 用户id
+     * @return 用户信息
+     */
+    public UserInfo getUserInfo(Long userId) {
+        UserInfo userInfo = redisCache.getCacheObject(CacheConstants.USER_INFO_KEY + userId);
+        if (Objects.isNull(userInfo)) {
+            userInfo = new UserInfo();
+            SysUser sysUser = sysUserService.selectUserById(userId);
+            BeanUtils.copyProperties(sysUser, userInfo);
+            updateDeptInfo(userInfo);
+            redisCache.setCacheObject(CacheConstants.USER_INFO_KEY + userId, userInfo);
+            redisCache.expire(CacheConstants.USER_INFO_KEY + userId, 300);
+        }
+        return userInfo;
+    }
+
+
+    /**
+     * 获取用户信息
+     *
+     * @param userName 用户登录账号
+     * @return 用户信息
+     */
+    public UserInfo getUserInfo(String userName) {
+        UserInfo userInfo = redisCache.getCacheObject(CacheConstants.USER_INFO_KEY + userName);
+        if (Objects.isNull(userInfo)) {
+            userInfo = new UserInfo();
+            SysUser sysUser = sysUserService.selectUserByUserName(userName);
+            BeanUtils.copyProperties(sysUser, userInfo);
+            updateDeptInfo(userInfo);
+            redisCache.setCacheObject(CacheConstants.USER_INFO_KEY + userName, userInfo);
+            redisCache.expire(CacheConstants.USER_INFO_KEY + userName, 300);
+        }
+        return userInfo;
+    }
+
+    private void updateDeptInfo(UserInfo userInfo) {
+        if (Objects.isNull(userInfo.getDeptId())) {
+            return;
+        }
+        List<SysDept> deptList = sysDeptService.selectAllDept(userInfo.getDeptId());
+        if (CollectionUtil.isEmpty(deptList)) {
+            return;
+        }
+        Collections.reverse(deptList);
+        SysDept teams = deptList.stream().filter(x -> StrUtil.equals(DeptType.TEAMS.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        SysDept department = deptList.stream().filter(x -> StrUtil.equals(DeptType.MANAGER.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        SysDept brigade = deptList.stream().filter(x -> StrUtil.equals(DeptType.BRIGADE.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        SysDept station = deptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        userInfo.setTeamsId(teams.getDeptId());
+        userInfo.setTeamsName(teams.getDeptName());
+        userInfo.setDepartmentId(department.getDeptId());
+        userInfo.setDepartmentName(department.getDeptName());
+        userInfo.setBrigadeId(brigade.getDeptId());
+        userInfo.setBrigadeName(brigade.getDeptName());
+        userInfo.setStationId(station.getDeptId());
+        userInfo.setStationName(station.getDeptName());
+    }
+}