格式化代码

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

@@ -27,14 +27,13 @@ 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
-{
+public class ApprovalController extends BaseController {
     @Autowired
     private IApprovalEngineService approvalEngineService;
 
@@ -44,8 +43,7 @@ public class ApprovalController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:approval:start')")
     @Log(title = "启动审批流程", businessType = BusinessType.INSERT)
     @PostMapping("/start")
-    public AjaxResult startProcess(@RequestBody Map<String, Object> params)
-    {
+    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());
@@ -54,11 +52,11 @@ public class ApprovalController extends BaseController
         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);
-            
+                workflowCode, businessType, businessId, title,
+                submitterId, submitterName, formData, businessData);
+
         return AjaxResult.success("流程启动成功", instance);
     }
 
@@ -68,14 +66,13 @@ public class ApprovalController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:approval:start')")
     @Log(title = "启动个人级别审批流程", businessType = BusinessType.INSERT)
     @PostMapping("/start/personal")
-    public AjaxResult startPersonalLevelProcess(@RequestBody Map<String, Object> params)
-    {
+    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");
@@ -86,18 +83,18 @@ public class ApprovalController extends BaseController
                 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);
-            
+                businessType, businessId, title, submitterId, submitterName,
+                sectionLeaderId, formData, businessData);
+
         return AjaxResult.success("个人级别流程启动成功", instance);
     }
 
@@ -107,14 +104,13 @@ public class ApprovalController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:approval:start')")
     @Log(title = "启动科级审批流程", businessType = BusinessType.INSERT)
     @PostMapping("/start/section")
-    public AjaxResult startSectionLevelProcess(@RequestBody Map<String, Object> params)
-    {
+    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");
@@ -125,17 +121,17 @@ public class ApprovalController extends BaseController
                 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);
-            
+                businessType, businessId, title, submitterId, submitterName, sectionLeaderId, formData, businessData);
+
         return AjaxResult.success("科级审批流程启动成功", instance);
     }
 
@@ -145,8 +141,7 @@ public class ApprovalController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:approval:start')")
     @Log(title = "启动班组级审批流程", businessType = BusinessType.INSERT)
     @PostMapping("/start/group")
-    public AjaxResult startGroupLevelProcess(@RequestBody Map<String, Object> params)
-    {
+    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");
@@ -154,10 +149,10 @@ public class ApprovalController extends BaseController
         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);
-            
+                businessType, businessId, title, submitterId, submitterName, formData, businessData);
+
         return AjaxResult.success("班组级审批流程启动成功", instance);
     }
 
@@ -167,8 +162,7 @@ public class ApprovalController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:approval:start')")
     @Log(title = "启动查获上报审批流程", businessType = BusinessType.INSERT)
     @PostMapping("/start/seizure")
-    public AjaxResult startSeizureReportProcess(@RequestBody Map<String, Object> params)
-    {
+    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");
@@ -177,11 +171,11 @@ public class ApprovalController extends BaseController
         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);
-            
+                businessType, businessId, title, submitterId, submitterName,
+                submitterRole, formData, businessData);
+
         return AjaxResult.success("查获上报审批流程启动成功", instance);
     }
 
@@ -191,13 +185,12 @@ public class ApprovalController extends BaseController
     @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)
-    {
+    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("审批失败");
     }
@@ -208,12 +201,11 @@ public class ApprovalController extends BaseController
     @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)
-    {
+    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("驳回失败");
     }
@@ -224,12 +216,11 @@ public class ApprovalController extends BaseController
     @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)
-    {
+    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("取消失败");
     }
@@ -239,8 +230,7 @@ public class ApprovalController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:approval:query')")
     @GetMapping("/tasks/pending")
-    public TableDataInfo getPendingTasks()
-    {
+    public TableDataInfo getPendingTasks() {
         Long userId = SecurityUtils.getUserId();
         List<ApprovalTask> list = approvalEngineService.getUserPendingTasks(userId);
         return getDataTable(list);
@@ -251,8 +241,7 @@ public class ApprovalController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:approval:query')")
     @GetMapping("/tasks/completed")
-    public TableDataInfo getCompletedTasks()
-    {
+    public TableDataInfo getCompletedTasks() {
         Long userId = SecurityUtils.getUserId();
         List<ApprovalTask> list = approvalEngineService.getUserCompletedTasks(userId);
         return getDataTable(list);
@@ -263,8 +252,7 @@ public class ApprovalController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:approval:query')")
     @GetMapping("/instances/submitted")
-    public TableDataInfo getSubmittedInstances(String status)
-    {
+    public TableDataInfo getSubmittedInstances(String status) {
         Long userId = SecurityUtils.getUserId();
         List<ApprovalInstance> list = approvalEngineService.getUserSubmittedInstances(userId, status);
         return getDataTable(list);
@@ -274,8 +262,7 @@ public class ApprovalController extends BaseController
      * 根据业务类型和级别获取流程代码
      */
     @GetMapping("/workflow/code")
-    public AjaxResult getWorkflowCode(String businessType, String level, String submitterRole)
-    {
+    public AjaxResult getWorkflowCode(String businessType, String level, String submitterRole) {
         String workflowCode = approvalEngineService.getWorkflowCodeByBusinessAndLevel(businessType, level, submitterRole);
         return AjaxResult.success(workflowCode);
     }
@@ -284,8 +271,7 @@ public class ApprovalController extends BaseController
      * 统计用户待办任务数量
      */
     @GetMapping("/tasks/pending/count")
-    public AjaxResult getPendingTasksCount()
-    {
+    public AjaxResult getPendingTasksCount() {
         Long userId = SecurityUtils.getUserId();
         List<ApprovalTask> tasks = approvalEngineService.getUserPendingTasks(userId);
         return AjaxResult.success(tasks.size());
@@ -293,6 +279,7 @@ public class ApprovalController extends BaseController
 
     /**
      * 批量审批任务（同意）
+     *
      * @param ids 任务ID列表
      */
     @PreAuthorize("@ss.hasPermi('system:approval:approve')")
@@ -308,6 +295,7 @@ public class ApprovalController extends BaseController
 
     /**
      * 批量驳回任务
+     *
      * @param ids 任务ID列表
      */
     @PreAuthorize("@ss.hasPermi('system:approval:reject')")

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

@@ -25,20 +25,19 @@ 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
-{
+public class CheckApprovalController extends BaseController {
     @Autowired
     private IApprovalEngineService approvalEngineService;
-    
+
     @Autowired
     private IApprovalUserService approvalUserService;
-    
+
     @Autowired
     private ICheckApprovalService checkApprovalService;
 
@@ -51,13 +50,13 @@ public class CheckApprovalController extends BaseController
     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
+                    requestData,
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername(),
+                    remark
             );
             return AjaxResult.success("个人级别检查流程启动成功", instance);
         } catch (Exception e) {
@@ -75,13 +74,13 @@ public class CheckApprovalController extends BaseController
     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
+                    requestData,
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername(),
+                    remark
             );
             return AjaxResult.success("科级检查流程启动成功", instance);
         } catch (Exception e) {
@@ -99,13 +98,13 @@ public class CheckApprovalController extends BaseController
     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
+                    requestData,
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername(),
+                    remark
             );
             return AjaxResult.success("班组级检查流程启动成功", instance);
         } catch (Exception e) {
@@ -123,13 +122,13 @@ public class CheckApprovalController extends BaseController
     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
+                    requestData,
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername(),
+                    remark
             );
             return AjaxResult.success("查获上报流程启动成功", instance);
         } catch (Exception e) {
@@ -147,11 +146,11 @@ public class CheckApprovalController extends BaseController
     public AjaxResult approveTask(@PathVariable Long taskId, @Valid @RequestBody ApprovalDTO approvalData) {
         try {
             ApprovalTask task = checkApprovalService.approveTask(
-                taskId, 
-                approvalData.getComment(), 
-                approvalData.getFormData(), 
-                SecurityUtils.getUserId(), 
-                SecurityUtils.getUsername()
+                    taskId,
+                    approvalData.getComment(),
+                    approvalData.getFormData(),
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername()
             );
             return AjaxResult.success("任务审批成功", task);
         } catch (Exception e) {
@@ -169,10 +168,10 @@ public class CheckApprovalController extends BaseController
     public AjaxResult rejectTask(@PathVariable Long taskId, @Valid @RequestBody RejectDTO rejectData) {
         try {
             ApprovalTask task = checkApprovalService.rejectTask(
-                taskId, 
-                rejectData.getRejectReason(), 
-                SecurityUtils.getUserId(), 
-                SecurityUtils.getUsername()
+                    taskId,
+                    rejectData.getRejectReason(),
+                    SecurityUtils.getUserId(),
+                    SecurityUtils.getUsername()
             );
             return AjaxResult.success("任务驳回成功", task);
         } catch (Exception e) {
@@ -251,8 +250,8 @@ public class CheckApprovalController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:approval:query')")
     @GetMapping("/approval/workflow-code")
-    public AjaxResult getWorkflowCode(@RequestParam String businessType, 
-                                     @RequestParam(required = false) String submitterRole) {
+    public AjaxResult getWorkflowCode(@RequestParam String businessType,
+                                      @RequestParam(required = false) String submitterRole) {
         try {
             // 暂时返回空值，需要实现该方法
             String workflowCode = null;
@@ -293,7 +292,7 @@ public class CheckApprovalController extends BaseController
             return getDataTable(null);
         }
     }
-    
+
     /**
      * 14. 根据实例ID获取审批历史
      */
@@ -301,15 +300,15 @@ public class CheckApprovalController extends BaseController
     @GetMapping("/approval/history/instance/{instanceId}")
     public TableDataInfo getApprovalHistoryByInstanceId(@PathVariable Long instanceId) {
         try {
-            List<com.sundot.airport.system.domain.approval.ApprovalHistory> list = 
-                checkApprovalService.getApprovalHistoryByInstanceId(instanceId);
+            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获取审批历史
      */
@@ -317,15 +316,15 @@ public class CheckApprovalController extends BaseController
     @GetMapping("/approval/history/task/{taskId}")
     public TableDataInfo getApprovalHistoryByTaskId(@PathVariable Long taskId) {
         try {
-            List<com.sundot.airport.system.domain.approval.ApprovalHistory> list = 
-                checkApprovalService.getApprovalHistoryByTaskId(taskId);
+            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. 获取用户的审批历史记录
      */
@@ -333,15 +332,15 @@ public class CheckApprovalController extends BaseController
     @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);
+            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. 批量更新抄送消息已读状态
      */

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

@@ -6,47 +6,70 @@ import java.util.Map;
 
 /**
  * 审批DTO
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
-public class ApprovalDTO
-{
-    /** 审批意见 */
+public class ApprovalDTO {
+    /**
+     * 审批意见
+     */
     @NotBlank(message = "审批意见不能为空")
     private String comment;
-    
-    /** 节点类型 */
+
+    /**
+     * 节点类型
+     */
     private String nodeType;
-    
-    /** 目标班组ID */
+
+    /**
+     * 目标班组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() {

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

@@ -6,27 +6,36 @@ import java.util.List;
 
 /**
  * 个人级别检查DTO
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
-public class PersonalCheckDTO
-{
-    /** 业务ID */
+public class PersonalCheckDTO {
+    /**
+     * 业务ID
+     */
     @NotNull(message = "业务ID不能为空")
     private Long id;
-    
-    /** 检查描述 */
+
+    /**
+     * 检查描述
+     */
     @NotBlank(message = "检查描述不能为空")
     private String description;
-    
-    /** 检查类型 */
+
+    /**
+     * 检查类型
+     */
     private String checkType;
-    
-    /** 检查位置 */
+
+    /**
+     * 检查位置
+     */
     private String location;
-    
-    /** 目标用户ID列表 */
+
+    /**
+     * 目标用户ID列表
+     */
     @NotNull(message = "目标用户ID列表不能为空")
     private Long[] targetUserIds;
 

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

@@ -4,13 +4,14 @@ import javax.validation.constraints.NotBlank;
 
 /**
  * 驳回DTO
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
-public class RejectDTO
-{
-    /** 驳回理由 */
+public class RejectDTO {
+    /**
+     * 驳回理由
+     */
     @NotBlank(message = "驳回理由不能为空")
     private String rejectReason;
 

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

@@ -5,27 +5,36 @@ import javax.validation.constraints.NotNull;
 
 /**
  * 科级检查DTO
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
-public class SectionCheckDTO
-{
-    /** 业务ID */
+public class SectionCheckDTO {
+    /**
+     * 业务ID
+     */
     @NotNull(message = "业务ID不能为空")
     private Long id;
-    
-    /** 检查描述 */
+
+    /**
+     * 检查描述
+     */
     @NotBlank(message = "检查描述不能为空")
     private String description;
-    
-    /** 检查类型 */
+
+    /**
+     * 检查类型
+     */
     private String checkType;
-    
-    /** 严重程度 */
+
+    /**
+     * 严重程度
+     */
     private String severity;
-    
-    /** 目标部门ID */
+
+    /**
+     * 目标部门ID
+     */
     private Long targetDeptId;
 
     public Long getId() {

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

@@ -6,30 +6,41 @@ import java.util.Date;
 
 /**
  * 查获上报DTO
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
-public class SeizureReportDTO
-{
-    /** 业务ID */
+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() {

airport-system/src/main/java/com/sundot/airport/system/mapper/approval/ApprovalCcMapper.java

@@ -10,16 +10,15 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * 审批抄送Mapper接口
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
 @Mapper
-public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
-{
+public interface ApprovalCcMapper extends BaseMapper<ApprovalCc> {
     /**
      * 查询审批抄送
-     * 
+     *
      * @param id 审批抄送主键
      * @return 审批抄送
      */
@@ -27,7 +26,7 @@ public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
 
     /**
      * 根据实例ID查询审批抄送列表
-     * 
+     *
      * @param instanceId 实例ID
      * @return 审批抄送列表
      */
@@ -35,16 +34,16 @@ public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
 
     /**
      * 根据抄送用户ID查询审批抄送列表
-     * 
+     *
      * @param ccUserId 抄送用户ID
-     * @param isRead 是否已读
+     * @param isRead   是否已读
      * @return 审批抄送列表
      */
     List<ApprovalCc> selectApprovalCcByCcUser(@Param("ccUserId") Long ccUserId, @Param("isRead") String isRead);
 
     /**
      * 查询审批抄送列表
-     * 
+     *
      * @param approvalCc 审批抄送
      * @return 审批抄送集合
      */
@@ -52,7 +51,7 @@ public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
 
     /**
      * 新增审批抄送
-     * 
+     *
      * @param approvalCc 审批抄送
      * @return 结果
      */
@@ -60,7 +59,7 @@ public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
 
     /**
      * 修改审批抄送
-     * 
+     *
      * @param approvalCc 审批抄送
      * @return 结果
      */
@@ -68,7 +67,7 @@ public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
 
     /**
      * 删除审批抄送
-     * 
+     *
      * @param id 审批抄送主键
      * @return 结果
      */
@@ -76,7 +75,7 @@ public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
 
     /**
      * 批量删除审批抄送
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
@@ -84,7 +83,7 @@ public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
 
     /**
      * 根据实例ID删除审批抄送
-     * 
+     *
      * @param instanceId 实例ID
      * @return 结果
      */
@@ -92,16 +91,16 @@ public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
 
     /**
      * 统计用户抄送消息数量
-     * 
+     *
      * @param ccUserId 抄送用户ID
-     * @param isRead 是否已读
+     * @param isRead   是否已读
      * @return 抄送消息数量
      */
     int countCcMessagesByCcUser(@Param("ccUserId") Long ccUserId, @Param("isRead") String isRead);
 
     /**
      * 获取用户抄送详情列表（关联实例和历史）
-     * 
+     *
      * @param ccUserId 抄送用户ID
      * @return 抄送详情列表
      */
@@ -109,7 +108,7 @@ public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
 
     /**
      * 直接获取用户抄送详情DTO列表（支持分页）
-     * 
+     *
      * @param ccUserId 抄送用户ID
      * @return 抄送详情DTO列表
      */
@@ -117,7 +116,7 @@ public interface ApprovalCcMapper extends BaseMapper<ApprovalCc>
 
     /**
      * 批量更新审批抄送已读状态
-     * 
+     *
      * @param ids 需要更新的ID列表
      * @return 结果
      */

airport-system/src/main/java/com/sundot/airport/system/mapper/approval/ApprovalHistoryMapper.java

@@ -9,16 +9,15 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * 审批历史Mapper接口
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
 @Mapper
-public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistory>
-{
+public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistory> {
     /**
      * 查询审批历史
-     * 
+     *
      * @param id 审批历史主键
      * @return 审批历史
      */
@@ -26,7 +25,7 @@ public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistory>
 
     /**
      * 根据实例ID查询审批历史列表
-     * 
+     *
      * @param instanceId 实例ID
      * @return 审批历史列表
      */
@@ -34,7 +33,7 @@ public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistory>
 
     /**
      * 根据任务ID查询审批历史列表
-     * 
+     *
      * @param taskId 任务ID
      * @return 审批历史列表
      */
@@ -42,16 +41,16 @@ public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistory>
 
     /**
      * 根据操作人ID查询审批历史列表
-     * 
+     *
      * @param operatorId 操作人ID
-     * @param action 操作类型
+     * @param action     操作类型
      * @return 审批历史列表
      */
     List<ApprovalHistory> selectApprovalHistoryByOperator(@Param("operatorId") Long operatorId, @Param("action") String action);
 
     /**
      * 查询审批历史列表
-     * 
+     *
      * @param approvalHistory 审批历史
      * @return 审批历史集合
      */
@@ -59,7 +58,7 @@ public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistory>
 
     /**
      * 新增审批历史
-     * 
+     *
      * @param approvalHistory 审批历史
      * @return 结果
      */
@@ -67,7 +66,7 @@ public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistory>
 
     /**
      * 修改审批历史
-     * 
+     *
      * @param approvalHistory 审批历史
      * @return 结果
      */
@@ -75,7 +74,7 @@ public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistory>
 
     /**
      * 删除审批历史
-     * 
+     *
      * @param id 审批历史主键
      * @return 结果
      */
@@ -83,7 +82,7 @@ public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistory>
 
     /**
      * 批量删除审批历史
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
@@ -91,7 +90,7 @@ public interface ApprovalHistoryMapper extends BaseMapper<ApprovalHistory>
 
     /**
      * 根据实例ID删除审批历史
-     * 
+     *
      * @param instanceId 实例ID
      * @return 结果
      */

airport-system/src/main/java/com/sundot/airport/system/mapper/approval/ApprovalInstanceMapper.java

@@ -11,16 +11,15 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * 审批实例Mapper接口
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
 @Mapper
-public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance>
-{
+public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance> {
     /**
      * 查询审批实例
-     * 
+     *
      * @param id 审批实例主键
      * @return 审批实例
      */
@@ -28,7 +27,7 @@ public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance>
 
     /**
      * 根据实例编号查询审批实例
-     * 
+     *
      * @param instanceNo 实例编号
      * @return 审批实例
      */
@@ -36,25 +35,25 @@ public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance>
 
     /**
      * 根据业务类型和业务ID查询审批实例
-     * 
+     *
      * @param businessType 业务类型
-     * @param businessId 业务ID
+     * @param businessId   业务ID
      * @return 审批实例列表
      */
     List<ApprovalInstance> selectApprovalInstanceByBusiness(@Param("businessType") String businessType, @Param("businessId") Long businessId);
 
     /**
      * 根据提交人ID查询审批实例列表
-     * 
+     *
      * @param submitterId 提交人ID
-     * @param status 实例状态
+     * @param status      实例状态
      * @return 审批实例列表
      */
     List<ApprovalInstance> selectApprovalInstanceBySubmitter(@Param("submitterId") Long submitterId, @Param("status") String status);
 
     /**
      * 查询审批实例列表
-     * 
+     *
      * @param approvalInstance 审批实例
      * @return 审批实例集合
      */
@@ -64,9 +63,9 @@ public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance>
      * 根据工作流ID列表、时间范围和用户ID列表查询审批实例列表
      *
      * @param workflowIds 工作流ID列表
-     * @param beginTime 开始时间
-     * @param endTime 结束时间
-     * @param userIds 用户ID列表
+     * @param beginTime   开始时间
+     * @param endTime     结束时间
+     * @param userIds     用户ID列表
      * @return 审批实例集合
      */
     List<ApprovalInstance> selectApprovalInstancesByWorkflowIdsAndTimeRangeAndUsers(
@@ -77,7 +76,7 @@ public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance>
 
     /**
      * 查询审批实例详情（包含关联数据）
-     * 
+     *
      * @param id 审批实例主键
      * @return 审批实例
      */
@@ -85,7 +84,7 @@ public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance>
 
     /**
      * 新增审批实例
-     * 
+     *
      * @param approvalInstance 审批实例
      * @return 结果
      */
@@ -93,7 +92,7 @@ public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance>
 
     /**
      * 修改审批实例
-     * 
+     *
      * @param approvalInstance 审批实例
      * @return 结果
      */
@@ -101,7 +100,7 @@ public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance>
 
     /**
      * 删除审批实例
-     * 
+     *
      * @param id 审批实例主键
      * @return 结果
      */
@@ -109,7 +108,7 @@ public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance>
 
     /**
      * 批量删除审批实例
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
@@ -117,7 +116,7 @@ public interface ApprovalInstanceMapper extends BaseMapper<ApprovalInstance>
 
     /**
      * 生成实例编号
-     * 
+     *
      * @return 实例编号
      */
     String generateInstanceNo();

airport-system/src/main/java/com/sundot/airport/system/mapper/approval/ApprovalNodeDefinitionMapper.java

@@ -9,16 +9,15 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * 审批节点定义Mapper接口
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
 @Mapper
-public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDefinition>
-{
+public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDefinition> {
     /**
      * 查询审批节点定义
-     * 
+     *
      * @param id 审批节点定义主键
      * @return 审批节点定义
      */
@@ -26,7 +25,7 @@ public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDef
 
     /**
      * 根据流程ID查询审批节点定义列表
-     * 
+     *
      * @param workflowId 流程定义ID
      * @return 审批节点定义列表
      */
@@ -34,16 +33,16 @@ public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDef
 
     /**
      * 根据流程ID和节点代码查询审批节点定义
-     * 
+     *
      * @param workflowId 流程定义ID
-     * @param nodeCode 节点代码
+     * @param nodeCode   节点代码
      * @return 审批节点定义
      */
     ApprovalNodeDefinition selectApprovalNodeDefinitionByWorkflowAndCode(@Param("workflowId") Long workflowId, @Param("nodeCode") String nodeCode);
 
     /**
      * 根据流程ID查询第一个节点
-     * 
+     *
      * @param workflowId 流程定义ID
      * @return 审批节点定义
      */
@@ -51,8 +50,8 @@ public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDef
 
     /**
      * 根据流程ID和当前节点顺序查询下一个节点
-     * 
-     * @param workflowId 流程定义ID
+     *
+     * @param workflowId   流程定义ID
      * @param currentOrder 当前节点顺序
      * @return 审批节点定义
      */
@@ -60,8 +59,8 @@ public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDef
 
     /**
      * 根据流程ID和当前节点顺序查询上一个节点
-     * 
-     * @param workflowId 流程定义ID
+     *
+     * @param workflowId   流程定义ID
      * @param currentOrder 当前节点顺序
      * @return 审批节点定义
      */
@@ -69,7 +68,7 @@ public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDef
 
     /**
      * 查询审批节点定义列表
-     * 
+     *
      * @param approvalNodeDefinition 审批节点定义
      * @return 审批节点定义集合
      */
@@ -77,7 +76,7 @@ public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDef
 
     /**
      * 新增审批节点定义
-     * 
+     *
      * @param approvalNodeDefinition 审批节点定义
      * @return 结果
      */
@@ -85,7 +84,7 @@ public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDef
 
     /**
      * 修改审批节点定义
-     * 
+     *
      * @param approvalNodeDefinition 审批节点定义
      * @return 结果
      */
@@ -93,7 +92,7 @@ public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDef
 
     /**
      * 删除审批节点定义
-     * 
+     *
      * @param id 审批节点定义主键
      * @return 结果
      */
@@ -101,7 +100,7 @@ public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDef
 
     /**
      * 批量删除审批节点定义
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
@@ -109,7 +108,7 @@ public interface ApprovalNodeDefinitionMapper extends BaseMapper<ApprovalNodeDef
 
     /**
      * 根据流程ID删除审批节点定义
-     * 
+     *
      * @param workflowId 流程定义ID
      * @return 结果
      */

airport-system/src/main/java/com/sundot/airport/system/mapper/approval/ApprovalTaskMapper.java

@@ -9,16 +9,15 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * 审批任务Mapper接口
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
 @Mapper
-public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
-{
+public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask> {
     /**
      * 查询审批任务
-     * 
+     *
      * @param id 审批任务主键
      * @return 审批任务
      */
@@ -26,7 +25,7 @@ public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
 
     /**
      * 根据任务编号查询审批任务
-     * 
+     *
      * @param taskNo 任务编号
      * @return 审批任务
      */
@@ -34,7 +33,7 @@ public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
 
     /**
      * 根据实例ID查询审批任务列表
-     * 
+     *
      * @param instanceId 实例ID
      * @return 审批任务列表
      */
@@ -42,25 +41,25 @@ public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
 
     /**
      * 根据处理人ID查询待办任务列表
-     * 
+     *
      * @param assigneeId 处理人ID
-     * @param status 任务状态
+     * @param status     任务状态
      * @return 审批任务列表
      */
     List<ApprovalTask> selectApprovalTaskByAssignee(@Param("assigneeId") Long assigneeId, @Param("status") String status);
 
     /**
      * 根据实例ID和节点ID查询审批任务
-     * 
+     *
      * @param instanceId 实例ID
-     * @param nodeId 节点ID
+     * @param nodeId     节点ID
      * @return 审批任务
      */
     ApprovalTask selectApprovalTaskByInstanceAndNode(@Param("instanceId") Long instanceId, @Param("nodeId") Long nodeId);
 
     /**
      * 查询审批任务列表
-     * 
+     *
      * @param approvalTask 审批任务
      * @return 审批任务集合
      */
@@ -68,7 +67,7 @@ public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
 
     /**
      * 查询审批任务详情（包含关联数据）
-     * 
+     *
      * @param id 审批任务主键
      * @return 审批任务
      */
@@ -76,7 +75,7 @@ public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
 
     /**
      * 新增审批任务
-     * 
+     *
      * @param approvalTask 审批任务
      * @return 结果
      */
@@ -84,7 +83,7 @@ public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
 
     /**
      * 修改审批任务
-     * 
+     *
      * @param approvalTask 审批任务
      * @return 结果
      */
@@ -92,7 +91,7 @@ public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
 
     /**
      * 删除审批任务
-     * 
+     *
      * @param id 审批任务主键
      * @return 结果
      */
@@ -100,7 +99,7 @@ public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
 
     /**
      * 批量删除审批任务
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
@@ -108,7 +107,7 @@ public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
 
     /**
      * 根据实例ID删除审批任务
-     * 
+     *
      * @param instanceId 实例ID
      * @return 结果
      */
@@ -116,14 +115,14 @@ public interface ApprovalTaskMapper extends BaseMapper<ApprovalTask>
 
     /**
      * 生成任务编号
-     * 
+     *
      * @return 任务编号
      */
     String generateTaskNo();
 
     /**
      * 统计用户待办任务数量
-     * 
+     *
      * @param assigneeId 处理人ID
      * @return 待办任务数量
      */

airport-system/src/main/java/com/sundot/airport/system/mapper/approval/ApprovalWorkflowDefinitionMapper.java

@@ -9,16 +9,15 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * 审批流程定义Mapper接口
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
 @Mapper
-public interface ApprovalWorkflowDefinitionMapper extends BaseMapper<ApprovalWorkflowDefinition>
-{
+public interface ApprovalWorkflowDefinitionMapper extends BaseMapper<ApprovalWorkflowDefinition> {
     /**
      * 查询审批流程定义
-     * 
+     *
      * @param id 审批流程定义主键
      * @return 审批流程定义
      */
@@ -26,7 +25,7 @@ public interface ApprovalWorkflowDefinitionMapper extends BaseMapper<ApprovalWor
 
     /**
      * 根据流程代码查询审批流程定义
-     * 
+     *
      * @param workflowCode 流程代码
      * @return 审批流程定义
      */
@@ -34,7 +33,7 @@ public interface ApprovalWorkflowDefinitionMapper extends BaseMapper<ApprovalWor
 
     /**
      * 根据流程类型查询审批流程定义列表
-     * 
+     *
      * @param workflowType 流程类型
      * @return 审批流程定义列表
      */
@@ -42,7 +41,7 @@ public interface ApprovalWorkflowDefinitionMapper extends BaseMapper<ApprovalWor
 
     /**
      * 查询审批流程定义列表
-     * 
+     *
      * @param approvalWorkflowDefinition 审批流程定义
      * @return 审批流程定义集合
      */
@@ -50,7 +49,7 @@ public interface ApprovalWorkflowDefinitionMapper extends BaseMapper<ApprovalWor
 
     /**
      * 新增审批流程定义
-     * 
+     *
      * @param approvalWorkflowDefinition 审批流程定义
      * @return 结果
      */
@@ -58,7 +57,7 @@ public interface ApprovalWorkflowDefinitionMapper extends BaseMapper<ApprovalWor
 
     /**
      * 修改审批流程定义
-     * 
+     *
      * @param approvalWorkflowDefinition 审批流程定义
      * @return 结果
      */
@@ -66,7 +65,7 @@ public interface ApprovalWorkflowDefinitionMapper extends BaseMapper<ApprovalWor
 
     /**
      * 删除审批流程定义
-     * 
+     *
      * @param id 审批流程定义主键
      * @return 结果
      */
@@ -74,7 +73,7 @@ public interface ApprovalWorkflowDefinitionMapper extends BaseMapper<ApprovalWor
 
     /**
      * 批量删除审批流程定义
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

airport-system/src/main/java/com/sundot/airport/system/service/approval/BusinessApprovalHandler.java

@@ -9,6 +9,7 @@ import com.sundot.airport.system.domain.approval.ApprovalInstance;
 public interface BusinessApprovalHandler {
     /**
      * 判断是否支持处理指定的业务类型
+     *
      * @param businessType 业务类型
      * @return true-支持，false-不支持
      */
@@ -16,18 +17,21 @@ public interface BusinessApprovalHandler {
 
     /**
      * 处理审批通过的业务逻辑
+     *
      * @param instance 审批实例
      */
     void handleApproved(ApprovalInstance instance);
 
     /**
      * 处理审批驳回的业务逻辑
+     *
      * @param instance 审批实例
      */
     void handleRejected(ApprovalInstance instance);
 
     /**
-     *  处理审批流程取消
+     * 处理审批流程取消
+     *
      * @param instance
      */
     void handleCancelled(ApprovalInstance instance);

airport-system/src/main/java/com/sundot/airport/system/service/approval/IApprovalEngineService.java

@@ -8,66 +8,65 @@ import com.sundot.airport.system.domain.approval.ApprovalTask;
 
 /**
  * 审批流程引擎Service接口
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
-public interface IApprovalEngineService
-{
+public interface IApprovalEngineService {
     /**
      * 启动审批流程
-     * 
-     * @param workflowCode 流程代码
-     * @param businessType 业务类型
-     * @param businessId 业务ID
-     * @param title 审批标题
-     * @param submitterId 提交人ID
+     *
+     * @param workflowCode  流程代码
+     * @param businessType  业务类型
+     * @param businessId    业务ID
+     * @param title         审批标题
+     * @param submitterId   提交人ID
      * @param submitterName 提交人姓名
-     * @param formData 表单数据
-     * @param businessData 业务数据
+     * @param formData      表单数据
+     * @param businessData  业务数据
      * @return 审批实例
      */
-    ApprovalInstance startProcess(String workflowCode, String businessType, Long businessId, 
-                                String title, Long submitterId, String submitterName, 
-                                Map<String, Object> formData, Map<String, Object> businessData);
+    ApprovalInstance startProcess(String workflowCode, String businessType, Long businessId,
+                                  String title, Long submitterId, String submitterName,
+                                  Map<String, Object> formData, Map<String, Object> businessData);
 
     /**
      * 审批任务（同意）
-     * 
-     * @param taskId 任务ID
-     * @param operatorId 操作人ID
+     *
+     * @param taskId       任务ID
+     * @param operatorId   操作人ID
      * @param operatorName 操作人姓名
-     * @param comment 审批意见
-     * @param formData 表单数据
+     * @param comment      审批意见
+     * @param formData     表单数据
      * @return 结果
      */
     boolean approveTask(Long taskId, Long operatorId, String operatorName, String comment, Map<String, Object> formData);
 
     /**
      * 驳回任务
-     * 
-     * @param taskId 任务ID
-     * @param operatorId 操作人ID
+     *
+     * @param taskId       任务ID
+     * @param operatorId   操作人ID
      * @param operatorName 操作人姓名
-     * @param comment 驳回理由
+     * @param comment      驳回理由
      * @return 结果
      */
     boolean rejectTask(Long taskId, Long operatorId, String operatorName, String comment);
 
     /**
      * 取消审批流程
-     * 
-     * @param instanceId 实例ID
-     * @param operatorId 操作人ID
+     *
+     * @param instanceId   实例ID
+     * @param operatorId   操作人ID
      * @param operatorName 操作人姓名
-     * @param comment 取消理由
+     * @param comment      取消理由
      * @return 结果
      */
     boolean cancelProcess(Long instanceId, Long operatorId, String operatorName, String comment);
 
     /**
      * 获取用户待办任务列表
-     * 
+     *
      * @param userId 用户ID
      * @return 待办任务列表
      */
@@ -75,7 +74,7 @@ public interface IApprovalEngineService
 
     /**
      * 获取用户已办任务列表
-     * 
+     *
      * @param userId 用户ID
      * @return 已办任务列表
      */
@@ -83,7 +82,7 @@ public interface IApprovalEngineService
 
     /**
      * 获取用户发起的审批实例列表
-     * 
+     *
      * @param userId 用户ID
      * @param status 状态
      * @return 审批实例列表
@@ -92,9 +91,9 @@ public interface IApprovalEngineService
 
     /**
      * 根据业务类型和级别获取对应的流程代码
-     * 
-     * @param businessType 业务类型
-     * @param level 级别
+     *
+     * @param businessType  业务类型
+     * @param level         级别
      * @param submitterRole 提交人角色
      * @return 流程代码
      */
@@ -102,70 +101,71 @@ public interface IApprovalEngineService
 
     /**
      * 个人级别审批流程（发送通知确认）
-     * 
-     * @param businessType 业务类型
-     * @param businessId 业务ID
-     * @param title 标题
-     * @param submitterId 提交人ID
+     *
+     * @param businessType  业务类型
+     * @param businessId    业务ID
+     * @param title         标题
+     * @param submitterId   提交人ID
      * @param submitterName 提交人姓名
      * @param targetUserIds 目标用户ID列表
-     * @param formData 表单数据
-     * @param businessData 业务数据
+     * @param formData      表单数据
+     * @param businessData  业务数据
      * @return 审批实例
      */
     ApprovalInstance startPersonalLevelProcess(String businessType, Long businessId, String title,
-                                             Long submitterId, String submitterName, Long sectionLeaderId,
-                                             Map<String, Object> formData, Map<String, Object> businessData);
+                                               Long submitterId, String submitterName, Long sectionLeaderId,
+                                               Map<String, Object> formData, Map<String, Object> businessData);
 
     /**
      * 科级审批流程
-     * 
-     * @param businessType 业务类型
-     * @param businessId 业务ID
-     * @param title 标题
-     * @param submitterId 提交人ID
-     * @param submitterName 提交人姓名
+     *
+     * @param businessType    业务类型
+     * @param businessId      业务ID
+     * @param title           标题
+     * @param submitterId     提交人ID
+     * @param submitterName   提交人姓名
      * @param sectionLeaderId 科长ID
-     * @param formData 表单数据
-     * @param businessData 业务数据
+     * @param formData        表单数据
+     * @param businessData    业务数据
      * @return 审批实例
      */
     ApprovalInstance startSectionLevelProcess(String businessType, Long businessId, String title,
-                                            Long submitterId, String submitterName, Long sectionLeaderId,
-                                            Map<String, Object> formData, Map<String, Object> businessData);
+                                              Long submitterId, String submitterName, Long sectionLeaderId,
+                                              Map<String, Object> formData, Map<String, Object> businessData);
 
     /**
      * 班组级审批流程
-     * 
-     * @param businessType 业务类型
-     * @param businessId 业务ID
-     * @param title 标题
-     * @param submitterId 提交人ID
+     *
+     * @param businessType  业务类型
+     * @param businessId    业务ID
+     * @param title         标题
+     * @param submitterId   提交人ID
      * @param submitterName 提交人姓名
-     * @param formData 表单数据
-     * @param businessData 业务数据
+     * @param formData      表单数据
+     * @param businessData  业务数据
      * @return 审批实例
      */
     ApprovalInstance startGroupLevelProcess(String businessType, Long businessId, String title,
-                                          Long submitterId, String submitterName,
-                                          Map<String, Object> formData, Map<String, Object> businessData);
+                                            Long submitterId, String submitterName,
+                                            Map<String, Object> formData, Map<String, Object> businessData);
 
     /**
      * 查获上报审批流程
-     * 
-     * @param businessType 业务类型
-     * @param businessId 业务ID
-     * @param title 标题
-     * @param submitterId 提交人ID
+     *
+     * @param businessType  业务类型
+     * @param businessId    业务ID
+     * @param title         标题
+     * @param submitterId   提交人ID
      * @param submitterName 提交人姓名
      * @param submitterRole 提交人角色
-     * @param formData 表单数据
-     * @param businessData 业务数据
+     * @param formData      表单数据
+     * @param businessData  业务数据
      * @return 审批实例
      */
     ApprovalInstance startSeizureReportProcess(String businessType, Long businessId, String title,
-                                             Long submitterId, String submitterName, String submitterRole,
-                                             Map<String, Object> formData, Map<String, Object> businessData);
+                                               Long submitterId, String submitterName, String submitterRole,
+                                               Map<String, Object> formData, Map<String, Object> businessData);
+
     /**
      * 批量审批任务（同意）
      *
@@ -175,7 +175,8 @@ public interface IApprovalEngineService
     boolean approveTaskList(List<Long> ids);
 
     /**
-     *  批量审批任务（驳回）
+     * 批量审批任务（驳回）
+     *
      * @param ids 任务ID列表
      * @return 批量结果
      */

airport-system/src/main/java/com/sundot/airport/system/service/approval/IApprovalUserService.java

@@ -4,25 +4,24 @@ import java.util.List;
 
 /**
  * 审批流程用户服务接口
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
-public interface IApprovalUserService
-{
+public interface IApprovalUserService {
     /**
      * 根据审批人类型获取审批人ID列表
-     * 
-     * @param approverType 审批人类型
+     *
+     * @param approverType  审批人类型
      * @param approverValue 审批人值
-     * @param businessData 业务数据（可用于动态获取审批人）
+     * @param businessData  业务数据（可用于动态获取审批人）
      * @return 审批人ID列表
      */
     List<Long> getApproverIds(String approverType, String approverValue, Object businessData);
 
     /**
      * 根据部门ID获取部门负责人（科长）
-     * 
+     *
      * @param deptId 部门ID
      * @return 部门负责人用户ID列表
      */
@@ -30,7 +29,7 @@ public interface IApprovalUserService
 
     /**
      * 根据用户ID获取所属部门的科长
-     * 
+     *
      * @param userId 用户ID
      * @return 科长用户ID列表
      */
@@ -38,7 +37,7 @@ public interface IApprovalUserService
 
     /**
      * 根据用户ID获取所属班组的班组长
-     * 
+     *
      * @param userId 用户ID
      * @return 班组长用户ID列表
      */
@@ -46,7 +45,7 @@ public interface IApprovalUserService
 
     /**
      * 根据角色标识获取用户ID列表
-     * 
+     *
      * @param roleKey 角色标识
      * @return 用户ID列表
      */
@@ -54,7 +53,7 @@ public interface IApprovalUserService
 
     /**
      * 根据部门ID获取部门下所有用户ID列表
-     * 
+     *
      * @param deptId 部门ID
      * @return 用户ID列表
      */
@@ -62,7 +61,7 @@ public interface IApprovalUserService
 
     /**
      * 判断用户是否为班组长角色
-     * 
+     *
      * @param userId 用户ID
      * @return 是否为班组长
      */
@@ -70,7 +69,7 @@ public interface IApprovalUserService
 
     /**
      * 判断用户是否为科长角色
-     * 
+     *
      * @param userId 用户ID
      * @return 是否为科长
      */
@@ -78,32 +77,32 @@ public interface IApprovalUserService
 
     /**
      * 根据业务数据动态获取整改班组
-     * 
+     *
      * @param businessData 业务数据
      * @return 班组ID
      */
     Long getTargetGroupIdFromBusinessData(Object businessData);
-    
+
     /**
      * 根据任务ID获取原始操作者（创建者或更新者）的用户ID
-     * 
+     *
      * @param taskId 任务ID
      * @return 原始操作者的用户ID，如果找不到返回null
      */
     Long getOriginalOperatorByTaskId(Long taskId);
-    
+
     /**
      * 根据任务ID获取任务的创建者或更新者用户ID（用于驳回回流）
-     * 
+     *
      * @param taskId 任务ID
      * @return 任务创建者或更新者的用户ID，如果找不到返回null
      */
     Long getTaskCreatorOrUpdaterByTaskId(Long taskId);
-    
+
     /**
      * 根据用户ID查找其直接上级（违禁品审批用）
      * 如果用户是安检员，找其班组长；如果是班组长，找其科长
-     * 
+     *
      * @param userId 用户ID
      * @return 直接上级的用户ID列表
      */

airport-system/src/main/java/com/sundot/airport/system/service/approval/IApprovalWorkflowService.java

@@ -1,19 +1,19 @@
 package com.sundot.airport.system.service.approval;
 
 import java.util.List;
+
 import com.sundot.airport.system.domain.approval.ApprovalWorkflowDefinition;
 
 /**
  * 审批流程定义Service接口
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
-public interface IApprovalWorkflowService
-{
+public interface IApprovalWorkflowService {
     /**
      * 查询审批流程定义
-     * 
+     *
      * @param id 审批流程定义主键
      * @return 审批流程定义
      */
@@ -21,7 +21,7 @@ public interface IApprovalWorkflowService
 
     /**
      * 根据流程代码查询审批流程定义
-     * 
+     *
      * @param workflowCode 流程代码
      * @return 审批流程定义
      */
@@ -29,7 +29,7 @@ public interface IApprovalWorkflowService
 
     /**
      * 根据流程类型查询审批流程定义列表
-     * 
+     *
      * @param workflowType 流程类型
      * @return 审批流程定义列表
      */
@@ -37,7 +37,7 @@ public interface IApprovalWorkflowService
 
     /**
      * 查询审批流程定义列表
-     * 
+     *
      * @param approvalWorkflowDefinition 审批流程定义
      * @return 审批流程定义集合
      */
@@ -45,7 +45,7 @@ public interface IApprovalWorkflowService
 
     /**
      * 新增审批流程定义
-     * 
+     *
      * @param approvalWorkflowDefinition 审批流程定义
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface IApprovalWorkflowService
 
     /**
      * 修改审批流程定义
-     * 
+     *
      * @param approvalWorkflowDefinition 审批流程定义
      * @return 结果
      */
@@ -61,7 +61,7 @@ public interface IApprovalWorkflowService
 
     /**
      * 批量删除审批流程定义
-     * 
+     *
      * @param ids 需要删除的审批流程定义主键集合
      * @return 结果
      */
@@ -69,7 +69,7 @@ public interface IApprovalWorkflowService
 
     /**
      * 删除审批流程定义信息
-     * 
+     *
      * @param id 审批流程定义主键
      * @return 结果
      */

airport-system/src/main/java/com/sundot/airport/system/service/approval/ICheckApprovalService.java

@@ -8,161 +8,161 @@ import java.util.Map;
 
 /**
  * 审批检查服务接口
- * 
+ *
  * @author airport-system
  */
 public interface ICheckApprovalService {
-    
+
     /**
      * 启动个人级别检查审批流程
-     * 
+     *
      * @param requestData 请求数据，包含checkType、location、targetUserIds、formData等
-     * @param userId 当前用户ID
-     * @param username 当前用户名
-     * @param remark 备注
+     * @param userId      当前用户ID
+     * @param username    当前用户名
+     * @param remark      备注
      * @return ApprovalInstance 审批实例
      * @throws Exception 启动流程失败时抛出异常
      */
     ApprovalInstance submitPersonalCheck(Map<String, Object> requestData, Long userId, String username, String remark) throws Exception;
-    
+
     /**
      * 启动科级检查审批流程
-     * 
+     *
      * @param requestData 请求数据，包含checkType、severity、targetDeptId、sectionLeaderId、formData等
-     * @param userId 当前用户ID
-     * @param username 当前用户名
-     * @param remark 备注
+     * @param userId      当前用户ID
+     * @param username    当前用户名
+     * @param remark      备注
      * @return ApprovalInstance 审批实例
      * @throws Exception 启动流程失败时抛出异常
      */
     ApprovalInstance submitSectionCheck(Map<String, Object> requestData, Long userId, String username, String remark) throws Exception;
-    
+
     /**
      * 启动班组级检查审批流程
-     * 
+     *
      * @param requestData 请求数据，包含checkType、severity、groupLeaderId、formData等
-     * @param userId 当前用户ID
-     * @param username 当前用户名
-     * @param remark 备注
+     * @param userId      当前用户ID
+     * @param username    当前用户名
+     * @param remark      备注
      * @return ApprovalInstance 审批实例
      * @throws Exception 启动流程失败时抛出异常
      */
     ApprovalInstance submitGroupCheck(Map<String, Object> requestData, Long userId, String username, String remark) throws Exception;
-    
+
     /**
      * 启动查获上报审批流程
-     * 
+     *
      * @param requestData 请求数据，包含seizureTime、passengerInfo、formData等
-     * @param userId 当前用户ID
-     * @param username 当前用户名
-     * @param remark 备注
+     * @param userId      当前用户ID
+     * @param username    当前用户名
+     * @param remark      备注
      * @return ApprovalInstance 审批实例
      * @throws Exception 启动流程失败时抛出异常
      */
     ApprovalInstance submitSeizureReport(Map<String, Object> requestData, Long userId, String username, String remark) throws Exception;
-    
+
     /**
      * 审批任务（同意）
-     * 
-     * @param taskId 任务ID
-     * @param comment 审批意见
+     *
+     * @param taskId   任务ID
+     * @param comment  审批意见
      * @param formData 表单数据（科长节点需要选择班组等）
-     * @param userId 当前用户ID
+     * @param userId   当前用户ID
      * @param username 当前用户名
      * @return ApprovalTask 处理后的任务
      * @throws Exception 审批失败时抛出异常
      */
     ApprovalTask approveTask(Long taskId, String comment, Map<String, Object> formData, Long userId, String username) throws Exception;
-    
+
     /**
      * 审批任务（驳回）
-     * 
-     * @param taskId 任务ID
-     * @param comment 驳回原因
-     * @param userId 当前用户ID
+     *
+     * @param taskId   任务ID
+     * @param comment  驳回原因
+     * @param userId   当前用户ID
      * @param username 当前用户名
      * @return ApprovalTask 处理后的任务
      * @throws Exception 驳回失败时抛出异常
      */
     ApprovalTask rejectTask(Long taskId, String comment, Long userId, String username) throws Exception;
-    
+
     /**
      * 获取用户待办任务列表
-     * 
+     *
      * @param userId 用户ID
      * @return List<ApprovalTask> 待办任务列表
      * @throws Exception 查询失败时抛出异常
      */
     List<ApprovalTask> getPendingTasks(Long userId) throws Exception;
-    
+
     /**
      * 获取用户已办任务列表
-     * 
+     *
      * @param userId 用户ID
      * @return List<ApprovalTask> 已办任务列表
      * @throws Exception 查询失败时抛出异常
      */
     List<ApprovalTask> getCompletedTasks(Long userId) throws Exception;
-    
+
     /**
      * 获取用户发起的审批实例列表
-     * 
+     *
      * @param userId 用户ID
      * @param status 状态筛选（可为空）
      * @return List<ApprovalInstance> 审批实例列表
      * @throws Exception 查询失败时抛出异常
      */
     List<ApprovalInstance> getSubmittedInstances(Long userId, String status) throws Exception;
-    
+
     /**
      * 获取用户待办任务数量
-     * 
+     *
      * @param userId 用户ID
      * @return Long 待办任务数量
      * @throws Exception 查询失败时抛出异常
      */
     Long getPendingTaskCount(Long userId) throws Exception;
-    
+
     /**
      * 获取用户抄送列表详情
-     * 
+     *
      * @param userId 用户ID
      * @return List 抄送详情列表
      * @throws Exception 查询失败时抛出异常
      */
     List<com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO> getCcDetailsByUserId(Long userId) throws Exception;
-    
+
     /**
      * 根据实例ID获取审批历史
-     * 
+     *
      * @param instanceId 审批实例ID
      * @return List<ApprovalHistory> 审批历史列表
      * @throws Exception 查询失败时抛出异常
      */
     List<com.sundot.airport.system.domain.approval.ApprovalHistory> getApprovalHistoryByInstanceId(Long instanceId) throws Exception;
-    
+
     /**
      * 根据任务ID获取审批历史
-     * 
+     *
      * @param taskId 任务ID
      * @return List<ApprovalHistory> 审批历史列表
      * @throws Exception 查询失败时抛出异常
      */
     List<com.sundot.airport.system.domain.approval.ApprovalHistory> getApprovalHistoryByTaskId(Long taskId) throws Exception;
-    
+
     /**
      * 获取用户的审批历史记录
-     * 
+     *
      * @param userId 用户ID
      * @param action 操作类型（可为空，如：SUBMIT, APPROVE, REJECT, CANCEL）
      * @return List<ApprovalHistory> 审批历史列表
      * @throws Exception 查询失败时抛出异常
      */
     List<com.sundot.airport.system.domain.approval.ApprovalHistory> getUserApprovalHistory(Long userId, String action) throws Exception;
-    
+
     /**
      * 批量更新审批抄送已读状态
-     * 
+     *
      * @param ids 需要更新的ID列表
      * @return 影响行数
      * @throws Exception 更新失败时抛出异常

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

@@ -29,42 +29,41 @@ import com.sundot.airport.system.mapper.SysUserMapper;
 
 /**
  * 审批流程引擎Service业务层处理
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
 @Service
-public class ApprovalEngineServiceImpl implements IApprovalEngineService
-{
+public class ApprovalEngineServiceImpl implements IApprovalEngineService {
     private static final Logger logger = LoggerFactory.getLogger(ApprovalEngineServiceImpl.class);
-    
+
     @Autowired
     private ApprovalWorkflowDefinitionMapper workflowDefinitionMapper;
-    
+
     @Autowired
     private ApprovalNodeDefinitionMapper nodeDefinitionMapper;
-    
+
     @Autowired
     private ApprovalInstanceMapper instanceMapper;
-    
+
     @Autowired
     private ApprovalTaskMapper taskMapper;
-    
+
     @Autowired
     private ApprovalHistoryMapper historyMapper;
-    
+
     @Autowired
     private ApprovalCcMapper ccMapper;
-    
+
     @Autowired
     private SysUserMapper sysUserMapper;
-    
+
     @Autowired
     private IApprovalUserService approvalUserService;
 
     @Autowired(required = false)
     private List<BusinessApprovalHandler> businessHandlers;
-    
+
     private ObjectMapper objectMapper = new ObjectMapper();
 
     /**
@@ -72,10 +71,9 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      */
     @Override
     @Transactional
-    public ApprovalInstance startProcess(String workflowCode, String businessType, Long businessId, 
-                                       String title, Long submitterId, String submitterName, 
-                                       Map<String, Object> formData, Map<String, Object> businessData)
-    {
+    public ApprovalInstance startProcess(String workflowCode, String businessType, Long businessId,
+                                         String title, Long submitterId, String submitterName,
+                                         Map<String, Object> formData, Map<String, Object> businessData) {
         // 1. 查询流程定义
         ApprovalWorkflowDefinition workflow = workflowDefinitionMapper.selectApprovalWorkflowDefinitionByCode(workflowCode);
         if (workflow == null) {
@@ -94,17 +92,17 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         instance.setSubmitTime(DateUtils.getNowDate());
         instance.setStatus("RUNNING");
         instance.setUrgentLevel("NORMAL");
-        
+
         try {
             instance.setFormData(formData != null ? objectMapper.writeValueAsString(formData) : null);
             instance.setBusinessData(businessData != null ? objectMapper.writeValueAsString(businessData) : null);
         } catch (Exception e) {
             throw new RuntimeException("表单数据序列化失败", e);
         }
-        
+
         instance.setCreateBy(SecurityUtils.getUsername());
         instance.setCreateTime(DateUtils.getNowDate());
-        
+
         instanceMapper.insertApprovalInstance(instance);
 
         // 3. 获取第一个节点
@@ -112,7 +110,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         if (firstNode != null) {
             instance.setCurrentNodeId(firstNode.getId());
             instanceMapper.updateApprovalInstance(instance);
-            
+
             // 4. 创建第一个任务（如果不是开始节点）
             if (!"START".equals(firstNode.getNodeType())) {
                 createTasksForNode(instance, firstNode, formData, null);
@@ -135,8 +133,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      */
     @Override
     @Transactional
-    public boolean approveTask(Long taskId, Long operatorId, String operatorName, String comment, Map<String, Object> formData)
-    {
+    public boolean approveTask(Long taskId, Long operatorId, String operatorName, String comment, Map<String, Object> formData) {
         // 1. 查询任务
         ApprovalTask task = taskMapper.selectApprovalTaskById(taskId);
         if (task == null || !"PENDING".equals(task.getStatus())) {
@@ -167,7 +164,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
 
         // 5. 记录历史
         recordHistory(instance.getId(), task.getId(), currentNode.getId(), currentNode.getNodeName(),
-                     "APPROVE", operatorId, operatorName, comment, formData);
+                "APPROVE", operatorId, operatorName, comment, formData);
 
         // 6. 流转到下一节点（传递当前任务引用）
         moveToNextNode(instance, currentNode, operatorId, operatorName, comment, formData, task);
@@ -180,8 +177,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      */
     @Override
     @Transactional
-    public boolean rejectTask(Long taskId, Long operatorId, String operatorName, String comment)
-    {
+    public boolean rejectTask(Long taskId, Long operatorId, String operatorName, String comment) {
         // 1. 查询任务
         ApprovalTask task = taskMapper.selectApprovalTaskById(taskId);
         if (task == null || !"PENDING".equals(task.getStatus())) {
@@ -226,7 +222,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
 
         // 6. 记录历史
         recordHistory(instance.getId(), task.getId(), currentNode.getId(), currentNode.getNodeName(),
-                     "REJECT", operatorId, operatorName, comment, null);
+                "REJECT", operatorId, operatorName, comment, null);
 
         // 执行业务处理逻辑
         executeBusinessLogic(instance, "REJECTED");
@@ -241,7 +237,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
     public boolean approveTaskList(List<Long> ids) {
         //获取当前登陆人
         SysUser user = sysUserMapper.selectUserById(SecurityUtils.getUserId());
-        
+
         boolean allSuccess = true;
         for (Long taskId : ids) {
             try {
@@ -277,8 +273,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      */
     @Override
     @Transactional
-    public boolean cancelProcess(Long instanceId, Long operatorId, String operatorName, String comment)
-    {
+    public boolean cancelProcess(Long instanceId, Long operatorId, String operatorName, String comment) {
         // 1. 查询实例
         ApprovalInstance instance = instanceMapper.selectApprovalInstanceById(instanceId);
         if (instance == null || !"RUNNING".equals(instance.getStatus())) {
@@ -295,7 +290,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         // 3. 取消所有待办任务
         List<ApprovalTask> pendingTasks = taskMapper.selectApprovalTaskByInstanceId(instanceId)
                 .stream().filter(task -> "PENDING".equals(task.getStatus())).collect(Collectors.toList());
-        
+
         for (ApprovalTask task : pendingTasks) {
             task.setStatus("CANCELLED");
             task.setCompleteTime(DateUtils.getNowDate());
@@ -315,8 +310,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      * 获取用户待办任务列表
      */
     @Override
-    public List<ApprovalTask> getUserPendingTasks(Long userId)
-    {
+    public List<ApprovalTask> getUserPendingTasks(Long userId) {
         return taskMapper.selectApprovalTaskByAssignee(userId, "PENDING");
     }
 
@@ -324,8 +318,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      * 获取用户已办任务列表
      */
     @Override
-    public List<ApprovalTask> getUserCompletedTasks(Long userId)
-    {
+    public List<ApprovalTask> getUserCompletedTasks(Long userId) {
         return taskMapper.selectApprovalTaskByAssignee(userId, null)
                 .stream().filter(task -> !"PENDING".equals(task.getStatus())).collect(Collectors.toList());
     }
@@ -334,8 +327,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      * 获取用户发起的审批实例列表
      */
     @Override
-    public List<ApprovalInstance> getUserSubmittedInstances(Long userId, String status)
-    {
+    public List<ApprovalInstance> getUserSubmittedInstances(Long userId, String status) {
         return instanceMapper.selectApprovalInstanceBySubmitter(userId, status);
     }
 
@@ -343,8 +335,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      * 根据业务类型和级别获取对应的流程代码
      */
     @Override
-    public String getWorkflowCodeByBusinessAndLevel(String businessType, String level, String submitterRole)
-    {
+    public String getWorkflowCodeByBusinessAndLevel(String businessType, String level, String submitterRole) {
         if ("SEIZURE_REPORT".equals(businessType)) {
             if ("SEIZURE_REPORT_LEADER".equals(submitterRole)) {
                 return "SEIZURE_REPORT_LEADER";
@@ -352,7 +343,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
                 return "SEIZURE_REPORT_STAFF";
             }
         }
-        
+
         switch (level) {
             case "PERSONAL":
                 return "PERSONAL_LEVEL";
@@ -371,22 +362,21 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
     @Override
     @Transactional
     public ApprovalInstance startPersonalLevelProcess(String businessType, Long businessId, String title,
-                                                    Long submitterId, String submitterName, Long sectionLeaderId,
-                                                    Map<String, Object> formData, Map<String, Object> businessData)
-    {
+                                                      Long submitterId, String submitterName, Long sectionLeaderId,
+                                                      Map<String, Object> formData, Map<String, Object> businessData) {
         // 新的个人级别流程：组长发起 → 科长审批 → 问题人整改 → 发起人审批 → 完成
-        ApprovalInstance instance = startProcess("PERSONAL_LEVEL", businessType, businessId, title, 
-                                                submitterId, submitterName, formData, businessData);
-        
+        ApprovalInstance instance = startProcess("PERSONAL_LEVEL", businessType, businessId, title,
+                submitterId, submitterName, formData, businessData);
+
         // 获取第一个审批节点（科长审批节点）
         ApprovalNodeDefinition firstApprovalNode = nodeDefinitionMapper.selectNextNodeByOrder(
                 instance.getWorkflowId(), 1); // 获取排序为2的节点（科长审批）
-        
+
         if (firstApprovalNode != null) {
             // 更新实例当前节点为科长审批节点
             instance.setCurrentNodeId(firstApprovalNode.getId());
             instanceMapper.updateApprovalInstance(instance);
-            
+
             // 创建科长审批任务
             SysUser sectionLeader = sysUserMapper.selectUserById(sectionLeaderId);
             if (sectionLeader != null) {
@@ -397,7 +387,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         } else {
             throw new RuntimeException("无法找到科长审批节点");
         }
-        
+
         return instance;
     }
 
@@ -407,9 +397,8 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
     @Override
     @Transactional
     public ApprovalInstance startSectionLevelProcess(String businessType, Long businessId, String title,
-                                                   Long submitterId, String submitterName, Long sectionLeaderId,
-                                                   Map<String, Object> formData, Map<String, Object> businessData)
-    {
+                                                     Long submitterId, String submitterName, Long sectionLeaderId,
+                                                     Map<String, Object> formData, Map<String, Object> businessData) {
         ApprovalWorkflowDefinition workflow = workflowDefinitionMapper.selectApprovalWorkflowDefinitionByCode("SECTION_LEVEL");
         if (workflow == null) {
             throw new RuntimeException("流程定义不存在: SECTION_LEVEL");
@@ -425,29 +414,29 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         instance.setSubmitterName(submitterName);
         instance.setSubmitTime(DateUtils.getNowDate());
         instance.setStatus("RUNNING");
-        
+
         try {
             instance.setFormData(formData != null ? objectMapper.writeValueAsString(formData) : null);
         } catch (Exception e) {
             throw new RuntimeException("表单数据序列化失败", e);
         }
-        
+
         // 扩展业务数据，添加科长ID和发起人ID用于后续流程
         if (businessData == null) {
             businessData = new HashMap<>();
         }
         businessData.put("sectionLeaderId", sectionLeaderId);
         businessData.put("initiatorId", submitterId);
-        
+
         try {
             instance.setBusinessData(objectMapper.writeValueAsString(businessData));
         } catch (Exception e) {
             throw new RuntimeException("业务数据序列化失败", e);
         }
-        
+
         instance.setCreateBy(SecurityUtils.getUsername());
         instance.setCreateTime(DateUtils.getNowDate());
-        
+
         instanceMapper.insertApprovalInstance(instance);
 
         // 获取第一个节点
@@ -455,7 +444,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         if (firstNode != null) {
             instance.setCurrentNodeId(firstNode.getId());
             instanceMapper.updateApprovalInstance(instance);
-            
+
             // 如果是开始节点，直接流转到下一个节点（科长审批）
             if ("START".equals(firstNode.getNodeType())) {
                 moveToNextNode(instance, firstNode, submitterId, submitterName, "提交", formData, null);
@@ -474,11 +463,10 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
     @Override
     @Transactional
     public ApprovalInstance startGroupLevelProcess(String businessType, Long businessId, String title,
-                                                 Long submitterId, String submitterName,
-                                                 Map<String, Object> formData, Map<String, Object> businessData)
-    {
-        return startProcess("GROUP_LEVEL", businessType, businessId, title, 
-                          submitterId, submitterName, formData, businessData);
+                                                   Long submitterId, String submitterName,
+                                                   Map<String, Object> formData, Map<String, Object> businessData) {
+        return startProcess("GROUP_LEVEL", businessType, businessId, title,
+                submitterId, submitterName, formData, businessData);
     }
 
     /**
@@ -487,19 +475,17 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
     @Override
     @Transactional
     public ApprovalInstance startSeizureReportProcess(String businessType, Long businessId, String title,
-                                                     Long submitterId, String submitterName, String submitterRole,
-                                                     Map<String, Object> formData, Map<String, Object> businessData)
-    {
+                                                      Long submitterId, String submitterName, String submitterRole,
+                                                      Map<String, Object> formData, Map<String, Object> businessData) {
         String workflowCode = getWorkflowCodeByBusinessAndLevel(businessType, null, submitterRole);
-        return startProcess(workflowCode, businessType, businessId, title, 
-                          submitterId, submitterName, formData, businessData);
+        return startProcess(workflowCode, businessType, businessId, title,
+                submitterId, submitterName, formData, businessData);
     }
 
     /**
      * 为节点创建任务
      */
-    private void createTasksForNode(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark)
-    {
+    private void createTasksForNode(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark) {
         // 根据审批人类型获取审批人列表
         List<Long> assigneeIds = getAssigneeIds(node, instance);
 
@@ -543,12 +529,11 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
             }
         }
     }
-    
+
     /**
      * 为节点创建任务（支持动态分配）
      */
-    private void createTasksForNodeWithDynamicAssignment(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark)
-    {
+    private void createTasksForNodeWithDynamicAssignment(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark) {
         // 使用带表单数据的获取审批人方法
         List<Long> assigneeIds = getAssigneeIds(node, instance, formData);
 
@@ -596,8 +581,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
     /**
      * 创建通知任务
      */
-    private void createNotificationTask(ApprovalInstance instance, Long userId, String userName, String taskName)
-    {
+    private void createNotificationTask(ApprovalInstance instance, Long userId, String userName, String taskName) {
         ApprovalTask task = new ApprovalTask();
         task.setTaskNo(taskMapper.generateTaskNo());
         task.setInstanceId(instance.getId());
@@ -607,17 +591,17 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         task.setAssigneeName(userName);
         task.setAssignTime(DateUtils.getNowDate());
         task.setStatus("PENDING");
-        
+
         // 设置备注（通知任务的默认备注）
         task.setRemark("系统自动分配的通知任务");
-        
+
         // 通知任务可以不设置formData，或者使用实例的formData
         task.setFormData(instance.getFormData());
-        
+
         task.setTimeoutTime(DateUtils.addHours(DateUtils.getNowDate(), 24)); // 24小时超时
         task.setCreateBy(SecurityUtils.getUsername());
         task.setCreateTime(DateUtils.getNowDate());
-        
+
         taskMapper.insertApprovalTask(task);
     }
 
@@ -639,7 +623,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         task.setTimeoutTime(DateUtils.addHours(DateUtils.getNowDate(), 48)); // 48小时超时
         task.setCreateBy(SecurityUtils.getUsername());
         task.setCreateTime(DateUtils.getNowDate());
-        
+
         taskMapper.insertApprovalTask(task);
     }
 
@@ -661,27 +645,26 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         task.setTimeoutTime(DateUtils.addHours(DateUtils.getNowDate(), 48)); // 48小时超时
         task.setCreateBy(SecurityUtils.getUsername());
         task.setCreateTime(DateUtils.getNowDate());
-        
+
         taskMapper.insertApprovalTask(task);
     }
 
     /**
      * 流转到下一节点
      */
-    private void moveToNextNode(ApprovalInstance instance, ApprovalNodeDefinition currentNode, 
-                               Long operatorId, String operatorName, String comment, Map<String, Object> formData, ApprovalTask currentTask)
-    {
+    private void moveToNextNode(ApprovalInstance instance, ApprovalNodeDefinition currentNode,
+                                Long operatorId, String operatorName, String comment, Map<String, Object> formData, ApprovalTask currentTask) {
         // 查找下一个节点
         ApprovalNodeDefinition nextNode = nodeDefinitionMapper.selectNextNodeByOrder(
                 instance.getWorkflowId(), currentNode.getSortOrder());
-        
+
         if (nextNode != null) {
             // 更新实例当前节点
             instance.setCurrentNodeId(nextNode.getId());
             instance.setUpdateBy(SecurityUtils.getUsername());
             instance.setUpdateTime(DateUtils.getNowDate());
             instanceMapper.updateApprovalInstance(instance);
-            
+
             if ("END".equals(nextNode.getNodeType())) {
                 // 结束节点，完成流程
                 completeProcess(instance, operatorId, operatorName);
@@ -696,14 +679,13 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
                 }
                 // 检查下一节点是否需要动态分配
                 else if (isSeizureReportWorkflow(instance) && ("GROUP_LEADER".equals(nextNode.getApproverType()) || "SECTION_LEADER".equals(nextNode.getApproverType()))) {
-                    Long submitterId=instance.getSubmitterId();
-                    if("SECTION_LEADER".equals(nextNode.getApproverType()) && ObjectUtil.isNotEmpty(currentTask) && ObjectUtil.isNotEmpty(currentTask.getAssigneeId())){
-                        submitterId=currentTask.getAssigneeId();
+                    Long submitterId = instance.getSubmitterId();
+                    if ("SECTION_LEADER".equals(nextNode.getApproverType()) && ObjectUtil.isNotEmpty(currentTask) && ObjectUtil.isNotEmpty(currentTask.getAssigneeId())) {
+                        submitterId = currentTask.getAssigneeId();
                     }
                     // 违禁品审批流程：根据提交人角色分配给其直接上级
-                    createTasksForNodeWithDirectSuperior(instance, nextNode, formData, null,submitterId);
-                }
-                else if ("GROUP_LEADER".equals(nextNode.getApproverType()) && formData != null && formData.containsKey("targetGroupId")) {
+                    createTasksForNodeWithDirectSuperior(instance, nextNode, formData, null, submitterId);
+                } else if ("GROUP_LEADER".equals(nextNode.getApproverType()) && formData != null && formData.containsKey("targetGroupId")) {
                     // 科长审批后，分配给指定班组的班组长
                     createTasksForNodeWithDynamicAssignment(instance, nextNode, formData, null);
                 } else if ("GROUP_LEADER".equals(nextNode.getApproverType()) && instance.getBusinessData() != null) {
@@ -716,8 +698,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
                 } else if ("DEPT_SECTION_LEADER".equals(nextNode.getApproverType())) {
                     // 科长复查完成后，分配给指定部门（如质检科）的科长
                     createTasksForNodeWithDeptSectionLeader(instance, nextNode, formData, null);
-                }
-                 else {
+                } else {
                     // 使用默认分配逻辑
                     createTasksForNode(instance, nextNode, formData, null);
                 }
@@ -731,20 +712,22 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
     /**
      * 完成流程
      */
-    private void completeProcess(ApprovalInstance instance, Long operatorId, String operatorName)
-    {
+    private void completeProcess(ApprovalInstance instance, Long operatorId, String operatorName) {
         instance.setStatus("COMPLETED");
         instance.setCompletionTime(DateUtils.getNowDate());
         instance.setCurrentNodeId(null);
         instance.setUpdateBy(SecurityUtils.getUsername());
         instance.setUpdateTime(DateUtils.getNowDate());
         instanceMapper.updateApprovalInstance(instance);
-        
+
         // 记录完成历史
         recordHistory(instance.getId(), null, null, null, "COMPLETE", operatorId, operatorName, "流程完成", null);
 
         // 创建抄送记录
-         if(!"SEIZURE_REPORT".equals(instance.getBusinessType())){ createCcRecords(instance);} ;
+        if (!"SEIZURE_REPORT".equals(instance.getBusinessType())) {
+            createCcRecords(instance);
+        }
+        ;
 
         // 执行业务处理逻辑
         executeBusinessLogic(instance, "APPROVED");
@@ -752,7 +735,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
 
     /**
      * 添加业务处理方法
-      */
+     */
     private void executeBusinessLogic(ApprovalInstance instance, String action) {
         if (businessHandlers == null || businessHandlers.isEmpty()) {
             return;
@@ -782,8 +765,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      * 记录历史
      */
     private void recordHistory(Long instanceId, Long taskId, Long nodeId, String nodeName, String action,
-                             Long operatorId, String operatorName, String comment, Map<String, Object> formData)
-    {
+                               Long operatorId, String operatorName, String comment, Map<String, Object> formData) {
         // 通过operatorId查询用户真实姓名
         String realOperatorName = operatorName;
         if (operatorId != null) {
@@ -792,7 +774,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
                 realOperatorName = operator.getNickName();
             }
         }
-        
+
         ApprovalHistory history = new ApprovalHistory();
         history.setInstanceId(instanceId);
         history.setTaskId(taskId);
@@ -803,33 +785,31 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         history.setOperatorName(realOperatorName);
         history.setOperationTime(DateUtils.getNowDate());
         history.setComment(comment);
-        
+
         try {
             history.setFormData(formData != null ? objectMapper.writeValueAsString(formData) : null);
         } catch (Exception e) {
             // 忽略序列化错误
         }
-        
+
         history.setCreateBy(SecurityUtils.getUsername());
         history.setCreateTime(DateUtils.getNowDate());
-        
+
         historyMapper.insertApprovalHistory(history);
     }
 
     /**
      * 根据节点配置获取审批人ID列表
      */
-    private List<Long> getAssigneeIds(ApprovalNodeDefinition node, ApprovalInstance instance)
-    {
+    private List<Long> getAssigneeIds(ApprovalNodeDefinition node, ApprovalInstance instance) {
         String businessData = instance.getBusinessData();
         return approvalUserService.getApproverIds(node.getApproverType(), node.getApproverValue(), businessData);
     }
-    
+
     /**
      * 根据节点配置和表单数据获取审批人ID列表（用于流转时的动态分配）
      */
-    private List<Long> getAssigneeIds(ApprovalNodeDefinition node, ApprovalInstance instance, Map<String, Object> formData)
-    {
+    private List<Long> getAssigneeIds(ApprovalNodeDefinition node, ApprovalInstance instance, Map<String, Object> formData) {
         // 优先使用表单数据（包含targetGroupId等动态信息）
         String dynamicData = null;
         if (formData != null) {
@@ -839,29 +819,28 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
                 // 忽略序列化错误，使用业务数据
             }
         }
-        
+
         // 如果没有表单数据或序列化失败，使用原始业务数据
         String businessData = dynamicData != null ? dynamicData : instance.getBusinessData();
         return approvalUserService.getApproverIds(node.getApproverType(), node.getApproverValue(), businessData);
     }
-    
+
     /**
      * 为节点创建任务（回流给原始操作者）
      */
-    private void createTasksForNodeWithOriginalOperator(ApprovalInstance instance, ApprovalNodeDefinition node, 
-                                                       Map<String, Object> formData, ApprovalTask currentTask, String remark)
-    {
+    private void createTasksForNodeWithOriginalOperator(ApprovalInstance instance, ApprovalNodeDefinition node,
+                                                        Map<String, Object> formData, ApprovalTask currentTask, String remark) {
         // 创建包含当前taskId的业务数据
         Map<String, Object> businessDataWithTaskId = new HashMap<>();
         if (currentTask != null) {
             businessDataWithTaskId.put("taskId", currentTask.getId());
         }
-        
+
         // 使用包含taskId的业务数据获取原始操作者
         try {
             String businessDataStr = objectMapper.writeValueAsString(businessDataWithTaskId);
             List<Long> assigneeIds = approvalUserService.getApproverIds(node.getApproverType(), node.getApproverValue(), businessDataStr);
-            
+
             for (Long assigneeId : assigneeIds) {
                 SysUser user = sysUserMapper.selectUserById(assigneeId);
                 if (user != null) {
@@ -905,35 +884,33 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
             throw new RuntimeException("创建原始操作者任务失败", e);
         }
     }
-    
+
     /**
      * 获取当前实例的活跃任务
      */
-    private ApprovalTask getCurrentTask(ApprovalInstance instance)
-    {
+    private ApprovalTask getCurrentTask(ApprovalInstance instance) {
         if (instance.getCurrentNodeId() != null) {
             List<ApprovalTask> tasks = taskMapper.selectApprovalTaskByInstanceId(instance.getId());
             return tasks.stream()
-                   .filter(task -> task.getNodeId().equals(instance.getCurrentNodeId()) && "PENDING".equals(task.getStatus()))
-                   .findFirst()
-                   .orElse(null);
+                    .filter(task -> task.getNodeId().equals(instance.getCurrentNodeId()) && "PENDING".equals(task.getStatus()))
+                    .findFirst()
+                    .orElse(null);
         }
         return null;
     }
-    
+
     /**
      * 为指定部门科长节点创建任务（质检科长审批）
      */
-    private void createTasksForNodeWithDeptSectionLeader(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark)
-    {
+    private void createTasksForNodeWithDeptSectionLeader(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark) {
         // 创建包含质检科ID的业务数据
         Map<String, Object> businessDataWithDeptId = new HashMap<>();
         businessDataWithDeptId.put("deptId", 289); // 质检科ID
-        
+
         try {
             String businessDataStr = objectMapper.writeValueAsString(businessDataWithDeptId);
             List<Long> assigneeIds = approvalUserService.getApproverIds(node.getApproverType(), node.getApproverValue(), businessDataStr);
-            
+
             for (Long assigneeId : assigneeIds) {
                 SysUser user = sysUserMapper.selectUserById(assigneeId);
                 if (user != null) {
@@ -977,22 +954,21 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
             throw new RuntimeException("创建质检科长任务失败", e);
         }
     }
-    
+
     /**
      * 创建驳回回流任务
      */
-    private void createBackflowTask(ApprovalInstance instance, ApprovalNodeDefinition currentNode, 
-                                   Long originalUserId, String rejectComment, String rejectOperatorName)
-    {
+    private void createBackflowTask(ApprovalInstance instance, ApprovalNodeDefinition currentNode,
+                                    Long originalUserId, String rejectComment, String rejectOperatorName) {
         SysUser originalUser = sysUserMapper.selectUserById(originalUserId);
         if (originalUser != null) {
             // 查找上一个节点
             ApprovalNodeDefinition previousNode = nodeDefinitionMapper.selectPreviousNodeByOrder(
-                instance.getWorkflowId(), currentNode.getSortOrder());
-            
+                    instance.getWorkflowId(), currentNode.getSortOrder());
+
             // 如果没有上一个节点，则使用当前节点（兼容处理）
             ApprovalNodeDefinition targetNode = previousNode != null ? previousNode : currentNode;
-            
+
             ApprovalTask backflowTask = new ApprovalTask();
             backflowTask.setTaskNo(taskMapper.generateTaskNo());
             backflowTask.setInstanceId(instance.getId());
@@ -1002,37 +978,36 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
             backflowTask.setAssigneeName(originalUser.getNickName());
             backflowTask.setAssignTime(DateUtils.getNowDate());
             backflowTask.setStatus("PENDING");
-            
+
             // 在任务备注中记录驳回信息
             backflowTask.setRemark("任务被" + rejectOperatorName + "驳回，驳回原因：" + rejectComment);
-            
+
             // 驳回回流任务使用实例的formData
             backflowTask.setFormData(instance.getFormData());
-            
+
             // 设置超时时间（默认48小时）
             backflowTask.setTimeoutTime(DateUtils.addHours(DateUtils.getNowDate(), 48));
-            
+
             backflowTask.setCreateBy(SecurityUtils.getUsername());
             backflowTask.setCreateTime(DateUtils.getNowDate());
-            
+
             taskMapper.insertApprovalTask(backflowTask);
-            
+
             // 记录回流历史
 //            recordHistory(instance.getId(), backflowTask.getId(), targetNode.getId(), targetNode.getNodeName(),
 //                         "BACKFLOW", originalUserId, originalUser.getNickName(),
 //                         "驳回回流，需要重新处理。驳回原因：" + rejectComment, null);
         }
     }
-    
+
     /**
      * 根据业务数据为班组长节点创建任务（班组级流程）
      */
-    private void createTasksForNodeWithBusinessData(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark)
-    {
+    private void createTasksForNodeWithBusinessData(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark) {
         try {
             // 使用实例的业务数据来获取班组长
             List<Long> assigneeIds = approvalUserService.getApproverIds(node.getApproverType(), node.getApproverValue(), instance.getBusinessData());
-            
+
             for (Long assigneeId : assigneeIds) {
                 SysUser user = sysUserMapper.selectUserById(assigneeId);
                 if (user != null) {
@@ -1076,12 +1051,11 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
             throw new RuntimeException("创建班组长任务失败", e);
         }
     }
-    
+
     /**
      * 判断是否为违禁品审批流程
      */
-    private boolean isSeizureReportWorkflow(ApprovalInstance instance)
-    {
+    private boolean isSeizureReportWorkflow(ApprovalInstance instance) {
         return "SEIZURE_REPORT".equals(instance.getBusinessType());
     }
 
@@ -1104,7 +1078,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      */
     private void handlePersonalCheckNodeAssignment(ApprovalInstance instance, ApprovalNodeDefinition nextNode, Map<String, Object> formData) {
         String nodeCode = nextNode.getNodeCode();
-        
+
         switch (nodeCode) {
             case "PROBLEM_USER_RECTIFY":
                 // 科长审批后 → 问题人整改
@@ -1126,7 +1100,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
      */
     private void handleSectionCheckNodeAssignment(ApprovalInstance instance, ApprovalNodeDefinition nextNode, Map<String, Object> formData) {
         String nodeCode = nextNode.getNodeCode();
-        
+
         switch (nodeCode) {
             case "GROUP_LEADER_RECTIFY":
                 // 检查是否需要流转至班组长（基于科长审批时的选择）
@@ -1235,15 +1209,15 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         }
         return null;
     }
-    
+
     /**
      * 自动取消同一节点的其他待办任务
      *
-     * @param instanceId 流程实例ID
-     * @param nodeId 审批节点ID
+     * @param instanceId    流程实例ID
+     * @param nodeId        审批节点ID
      * @param currentTaskId 当前已处理的任务ID（不取消此任务）
-     * @param operatorId 操作人ID
-     * @param operatorName 操作人姓名
+     * @param operatorId    操作人ID
+     * @param operatorName  操作人姓名
      */
     private void cancelOtherPendingTasksInSameNode(Long instanceId, Long nodeId, Long currentTaskId, Long operatorId, String operatorName) {
         try {
@@ -1251,10 +1225,10 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
             List<ApprovalTask> allTasks = taskMapper.selectApprovalTaskByInstanceId(instanceId);
 
             List<ApprovalTask> pendingTasks = allTasks.stream()
-                .filter(t -> t.getNodeId().equals(nodeId))
-                .filter(t -> "PENDING".equals(t.getStatus()))
-                .filter(t -> !t.getId().equals(currentTaskId))  // 排除当前任务
-                .collect(Collectors.toList());
+                    .filter(t -> t.getNodeId().equals(nodeId))
+                    .filter(t -> "PENDING".equals(t.getStatus()))
+                    .filter(t -> !t.getId().equals(currentTaskId))  // 排除当前任务
+                    .collect(Collectors.toList());
 
             if (pendingTasks.isEmpty()) {
                 return;
@@ -1272,15 +1246,15 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
 
                 // 3. 记录取消历史
                 recordHistory(
-                    instanceId,
-                    taskToCancel.getId(),
-                    nodeId,
-                    taskToCancel.getTaskName(),
-                    "AUTO_CANCEL",
-                    operatorId,
-                    operatorName,
-                    "同节点任务已由其他审批人处理，自动取消",
-                    null
+                        instanceId,
+                        taskToCancel.getId(),
+                        nodeId,
+                        taskToCancel.getTaskName(),
+                        "AUTO_CANCEL",
+                        operatorId,
+                        operatorName,
+                        "同节点任务已由其他审批人处理，自动取消",
+                        null
                 );
             }
 
@@ -1296,17 +1270,16 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
     /**
      * 为违禁品审批节点创建任务（根据提交人角色分配给其直接上级）
      */
-    private void createTasksForNodeWithDirectSuperior(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark,Long submitterId)
-    {
+    private void createTasksForNodeWithDirectSuperior(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark, Long submitterId) {
         try {
-            
+
             // 根据提交人查找其直接上级
             List<Long> assigneeIds = approvalUserService.getDirectSuperiorIds(submitterId);
-            
+
             if (assigneeIds.isEmpty()) {
                 throw new RuntimeException("未找到提交人的直接上级，无法分配审批任务");
             }
-            
+
             for (Long assigneeId : assigneeIds) {
                 SysUser user = sysUserMapper.selectUserById(assigneeId);
                 if (user != null) {
@@ -1319,7 +1292,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
                     task.setAssigneeName(user.getNickName());
                     task.setAssignTime(DateUtils.getNowDate());
                     task.setStatus("PENDING");
-                    
+
                     // 设置表单数据 - 如果formData为空，使用当前实例的formData
                     try {
                         if (formData != null) {
@@ -1331,15 +1304,15 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
                         // 序列化失败时使用实例的formData
                         task.setFormData(instance.getFormData());
                     }
-                    
+
                     // 设置超时时间
                     if (node.getTimeoutHours() != null && node.getTimeoutHours() > 0) {
                         task.setTimeoutTime(DateUtils.addHours(DateUtils.getNowDate(), node.getTimeoutHours()));
                     }
-                    
+
                     task.setCreateBy(SecurityUtils.getUsername());
                     task.setCreateTime(DateUtils.getNowDate());
-                    
+
                     taskMapper.insertApprovalTask(task);
                 }
             }
@@ -1347,7 +1320,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
             throw new RuntimeException("创建违禁品审批任务失败：" + e.getMessage(), e);
         }
     }
-    
+
     /**
      * 创建抄送记录
      * 抄送对象包括：发起人、groupLeaderId（如果存在）、质检科所有人员
@@ -1356,7 +1329,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         try {
             // 收集抄送用户ID，使用Set避免重复
             java.util.Set<Long> ccUserIds = new java.util.HashSet<>();
-            
+
             // 根据业务类型决定抄送对象
             if ("PERSONAL_CHECK".equals(instance.getBusinessType())) {
                 // 个人级别检查：抄送质检科、组长发起人、审批科长
@@ -1365,7 +1338,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
                 // 其他流程：原有逻辑
                 createDefaultCcRecords(instance, ccUserIds);
             }
-            
+
             // 创建抄送记录
             Date ccTime = DateUtils.getNowDate();
             for (Long ccUserId : ccUserIds) {
@@ -1379,11 +1352,11 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
                     cc.setIsRead("0"); // 未读
                     cc.setCreateBy(SecurityUtils.getUsername());
                     cc.setCreateTime(ccTime);
-                    
+
                     ccMapper.insertApprovalCc(cc);
                 }
             }
-            
+
         } catch (Exception e) {
             // 记录错误但不中断流程
             e.printStackTrace();
@@ -1396,13 +1369,13 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
     private void createPersonalCheckCcRecords(ApprovalInstance instance, java.util.Set<Long> ccUserIds) {
         // 1. 添加发起人（组长）
         ccUserIds.add(instance.getSubmitterId());
-        
+
         // 2. 添加质检科所有人员
         List<SysUser> qualityUsers = sysUserMapper.selectUsersByRoleName("质检科");
         for (SysUser user : qualityUsers) {
             ccUserIds.add(user.getUserId());
         }
-        
+
         // 3. 从business_data中提取sectionLeaderId（审批科长）
         if (StringUtils.isNotEmpty(instance.getBusinessData())) {
             Long sectionLeaderId = extractSectionLeaderIdFromBusinessData(instance.getBusinessData());
@@ -1418,7 +1391,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
     private void createDefaultCcRecords(ApprovalInstance instance, java.util.Set<Long> ccUserIds) {
         // 1. 添加发起人
         ccUserIds.add(instance.getSubmitterId());
-        
+
         // 2. 从business_data中提取groupLeaderId
         if (StringUtils.isNotEmpty(instance.getBusinessData())) {
             Long groupLeaderId = extractGroupLeaderIdFromBusinessData(instance.getBusinessData());
@@ -1426,7 +1399,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
                 ccUserIds.add(groupLeaderId);
             }
         }
-        
+
         // 3. 添加质检科所有人员
         List<SysUser> qualityUsers = sysUserMapper.selectUsersByRoleName("质检科");
         for (SysUser user : qualityUsers) {
@@ -1451,7 +1424,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         }
         return null;
     }
-    
+
     /**
      * 从业务数据JSON中提取groupLeaderId
      */
@@ -1510,13 +1483,13 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
         try {
             Object groupLeaderIdObj = formData.get("groupLeaderId");
             Long groupLeaderId = null;
-            
+
             if (groupLeaderIdObj instanceof Number) {
                 groupLeaderId = ((Number) groupLeaderIdObj).longValue();
             } else if (groupLeaderIdObj instanceof String) {
                 groupLeaderId = Long.parseLong((String) groupLeaderIdObj);
             }
-            
+
             if (groupLeaderId != null) {
                 SysUser groupLeader = sysUserMapper.selectUserById(groupLeaderId);
                 if (groupLeader != null) {
@@ -1582,19 +1555,19 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService
             // 查找发起人审批节点
             List<ApprovalNodeDefinition> nodes = nodeDefinitionMapper.selectApprovalNodeDefinitionByWorkflowId(instance.getWorkflowId());
             ApprovalNodeDefinition initiatorNode = null;
-            
+
             for (ApprovalNodeDefinition node : nodes) {
                 if ("INITIATOR_FINAL_REVIEW".equals(node.getNodeCode())) {
                     initiatorNode = node;
                     break;
                 }
             }
-            
+
             if (initiatorNode != null) {
                 // 更新实例当前节点
                 instance.setCurrentNodeId(initiatorNode.getId());
                 instanceMapper.updateApprovalInstance(instance);
-                
+
                 // 创建发起人审批任务
                 createTaskForInitiatorFinalReview(instance, initiatorNode, formData);
             } else {

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

@@ -20,25 +20,24 @@ import com.sundot.airport.system.service.approval.IApprovalUserService;
 
 /**
  * 审批流程用户服务实现
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
 @Service
-public class ApprovalUserServiceImpl implements IApprovalUserService
-{
+public class ApprovalUserServiceImpl implements IApprovalUserService {
     @Autowired
     private SysUserMapper userMapper;
-    
+
     @Autowired
     private SysDeptMapper deptMapper;
-    
+
     @Autowired
     private SysRoleMapper roleMapper;
-    
+
     @Autowired
     private ApprovalTaskMapper taskMapper;
-    
+
     @Autowired
     private ApprovalInstanceMapper instanceMapper;
 
@@ -46,8 +45,7 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
      * 根据审批人类型获取审批人ID列表
      */
     @Override
-    public List<Long> getApproverIds(String approverType, String approverValue, Object businessData)
-    {
+    public List<Long> getApproverIds(String approverType, String approverValue, Object businessData) {
         switch (approverType) {
             case "USER":
                 // 指定用户，approverValue为用户ID，多个用逗号分隔
@@ -64,11 +62,11 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                     return userIds;
                 }
                 break;
-                
+
             case "ROLE":
                 // 角色，approverValue为角色标识
                 return getUserIdsByRoleKey(approverValue);
-                
+
             case "DEPT":
                 // 部门，approverValue为部门ID
                 if (approverValue != null) {
@@ -80,27 +78,27 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                     }
                 }
                 break;
-                
+
             case "GROUP_LEADER":
                 // 班组长，根据业务数据动态获取
                 return getGroupLeaderIdsByBusinessData(businessData);
-                
+
             case "SECTION_LEADER":
                 // 科长，根据业务数据动态获取
                 return getSectionLeaderIdsByBusinessData(businessData);
-                
+
             case "ORIGINAL_OPERATOR":
                 // 原始操作者，根据业务数据中的taskId获取
                 return getOriginalOperatorIdsByBusinessData(businessData);
-                
+
             case "DEPT_SECTION_LEADER":
                 // 指定部门的科长，根据业务数据中的deptId获取
                 return getDeptSectionLeaderIdsByBusinessData(businessData);
-                
+
             default:
                 break;
         }
-        
+
         return new ArrayList<>();
     }
 
@@ -109,30 +107,29 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
      * 如果传入的是班组ID，会自动查找其父部门的科长
      */
     @Override
-    public List<Long> getDeptLeaderIds(Long deptId)
-    {
+    public List<Long> getDeptLeaderIds(Long deptId) {
         List<Long> leaderIds = new ArrayList<>();
-        
+
         if (deptId == null) {
             return leaderIds;
         }
-        
+
         // 获取传入的部门信息
         SysDept dept = deptMapper.selectDeptById(deptId);
         if (dept == null) {
             return leaderIds;
         }
-        
+
         // 确定要查找科长的科室ID
         Long sectionDeptId = deptId;
-        
+
         // 如果当前部门有父部门，说明这是班组，需要找父部门（科室）的科长
         if (dept.getParentId() != null && dept.getParentId() != 100) {
             sectionDeptId = dept.getParentId();
             // 重新获取科室部门信息
             dept = deptMapper.selectDeptById(sectionDeptId);
         }
-        
+
         if (dept != null) {
             // 方法1: 根据部门负责人姓名查找用户
             if (dept.getLeader() != null && !dept.getLeader().isEmpty()) {
@@ -141,11 +138,11 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                     leaderIds.add(leader.getUserId());
                 }
             }
-            
+
             // 方法2: 根据角色查找科长（在该科室下的科长）
             List<Long> sectionLeaderIds = getUserIdsByRoleKey("kezhang");
             List<SysUser> sectionUsers = userMapper.selectUsersByDeptId(sectionDeptId);
-            
+
             for (SysUser user : sectionUsers) {
                 if (sectionLeaderIds.contains(user.getUserId())) {
                     if (!leaderIds.contains(user.getUserId())) {
@@ -154,7 +151,7 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                 }
             }
         }
-        
+
         return leaderIds;
     }
 
@@ -162,8 +159,7 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
      * 根据用户ID获取所属部门的科长
      */
     @Override
-    public List<Long> getSectionLeaderIdsByUserId(Long userId)
-    {
+    public List<Long> getSectionLeaderIdsByUserId(Long userId) {
         SysUser user = userMapper.selectUserById(userId);
         if (user != null && user.getDeptId() != null) {
             return getDeptLeaderIds(user.getDeptId());
@@ -175,15 +171,14 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
      * 根据用户ID获取所属班组的班组长
      */
     @Override
-    public List<Long> getGroupLeaderIdsByUserId(Long userId)
-    {
+    public List<Long> getGroupLeaderIdsByUserId(Long userId) {
         List<Long> groupLeaderIds = new ArrayList<>();
-        
+
         SysUser user = userMapper.selectUserById(userId);
         if (user != null && user.getDeptId() != null) {
             // 获取班组长角色的用户
             List<Long> groupLeaderRoleIds = getUserIdsByRoleKey("banzuzhang");
-            
+
             // 获取同部门的班组长
             List<SysUser> deptUsers = userMapper.selectUsersByDeptId(user.getDeptId());
             for (SysUser deptUser : deptUsers) {
@@ -192,7 +187,7 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                 }
             }
         }
-        
+
         return groupLeaderIds;
     }
 
@@ -200,45 +195,42 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
      * 根据角色标识获取用户ID列表
      */
     @Override
-    public List<Long> getUserIdsByRoleKey(String roleKey)
-    {
+    public List<Long> getUserIdsByRoleKey(String roleKey) {
         if (roleKey == null) {
             return new ArrayList<>();
         }
-        
+
         List<SysUser> users = userMapper.selectUsersByRoleKey(roleKey);
         return users.stream()
-                   .map(SysUser::getUserId)
-                   .collect(Collectors.toList());
+                .map(SysUser::getUserId)
+                .collect(Collectors.toList());
     }
 
     /**
      * 根据部门ID获取部门下所有用户ID列表
      */
     @Override
-    public List<Long> getUserIdsByDeptId(Long deptId)
-    {
+    public List<Long> getUserIdsByDeptId(Long deptId) {
         if (deptId == null) {
             return new ArrayList<>();
         }
-        
+
         List<SysUser> users = userMapper.selectUsersByDeptId(deptId);
         return users.stream()
-                   .filter(user -> "0".equals(user.getStatus()) && "0".equals(user.getDelFlag()))
-                   .map(SysUser::getUserId)
-                   .collect(Collectors.toList());
+                .filter(user -> "0".equals(user.getStatus()) && "0".equals(user.getDelFlag()))
+                .map(SysUser::getUserId)
+                .collect(Collectors.toList());
     }
 
     /**
      * 判断用户是否为班组长角色
      */
     @Override
-    public boolean isGroupLeader(Long userId)
-    {
+    public boolean isGroupLeader(Long userId) {
         if (userId == null) {
             return false;
         }
-        
+
         List<Long> groupLeaderIds = getUserIdsByRoleKey("banzuzhang");
         return groupLeaderIds.contains(userId);
     }
@@ -247,12 +239,11 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
      * 判断用户是否为科长角色
      */
     @Override
-    public boolean isSectionLeader(Long userId)
-    {
+    public boolean isSectionLeader(Long userId) {
         if (userId == null) {
             return false;
         }
-        
+
         List<Long> sectionLeaderIds = getUserIdsByRoleKey("kezhang");
         return sectionLeaderIds.contains(userId);
     }
@@ -261,8 +252,7 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
      * 根据业务数据动态获取整改班组
      */
     @Override
-    public Long getTargetGroupIdFromBusinessData(Object businessData)
-    {
+    public Long getTargetGroupIdFromBusinessData(Object businessData) {
         if (businessData instanceof String) {
             try {
                 String businessDataStr = (String) businessData;
@@ -280,15 +270,14 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                 return null;
             }
         }
-        
+
         return null;
     }
 
     /**
      * 根据业务数据获取班组长ID列表
      */
-    private List<Long> getGroupLeaderIdsByBusinessData(Object businessData)
-    {
+    private List<Long> getGroupLeaderIdsByBusinessData(Object businessData) {
         // 优先检查是否有直接指定的groupLeaderId
         Long groupLeaderId = getGroupLeaderIdFromBusinessData(businessData);
         if (groupLeaderId != null) {
@@ -296,22 +285,22 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
             result.add(groupLeaderId);
             return result;
         }
-        
+
         Long targetId = null;
-        
+
         // 尝试从业务数据中获取targetGroupId或targetDeptId
         targetId = getTargetGroupIdFromBusinessData(businessData);
         if (targetId == null) {
             targetId = getTargetDeptIdFromBusinessData(businessData);
         }
-        
+
         if (targetId != null) {
             // 获取班组长角色的用户
             List<Long> groupLeaderRoleIds = getUserIdsByRoleKey("banzuzhang");
-            
+
             // 获取目标部门/班组的所有用户
             List<SysUser> groupUsers = userMapper.selectUsersByDeptId(targetId);
-            
+
             // 找到交集：既在目标部门/班组，又是班组长角色的用户
             List<Long> groupLeaderIds = new ArrayList<>();
             for (SysUser user : groupUsers) {
@@ -319,10 +308,10 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                     groupLeaderIds.add(user.getUserId());
                 }
             }
-            
+
             return groupLeaderIds;
         }
-        
+
         // 如果无法从业务数据中获取，返回空列表
         return new ArrayList<>();
     }
@@ -330,8 +319,7 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
     /**
      * 根据业务数据获取科长ID列表
      */
-    private List<Long> getSectionLeaderIdsByBusinessData(Object businessData)
-    {
+    private List<Long> getSectionLeaderIdsByBusinessData(Object businessData) {
         // 优先检查是否有直接指定的sectionLeaderId
         Long sectionLeaderId = getSectionLeaderIdFromBusinessData(businessData);
         if (sectionLeaderId != null) {
@@ -339,14 +327,14 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
             result.add(sectionLeaderId);
             return result;
         }
-        
+
         // 如果没有直接指定的sectionLeaderId，则根据业务数据获取目标部门ID
         Long targetDeptId = getTargetDeptIdFromBusinessData(businessData);
-        
+
         if (targetDeptId != null) {
             return getDeptLeaderIds(targetDeptId);
         }
-        
+
         // 如果无法从业务数据中获取，返回空列表
         return new ArrayList<>();
     }
@@ -354,8 +342,7 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
     /**
      * 根据业务数据获取直接指定的班组长ID
      */
-    private Long getGroupLeaderIdFromBusinessData(Object businessData)
-    {
+    private Long getGroupLeaderIdFromBusinessData(Object businessData) {
         if (businessData instanceof String) {
             try {
                 String businessDataStr = (String) businessData;
@@ -374,12 +361,11 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
         }
         return null;
     }
-    
+
     /**
      * 根据业务数据获取直接指定的科长ID
      */
-    private Long getSectionLeaderIdFromBusinessData(Object businessData)
-    {
+    private Long getSectionLeaderIdFromBusinessData(Object businessData) {
         if (businessData instanceof String) {
             try {
                 String businessDataStr = (String) businessData;
@@ -398,12 +384,11 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
         }
         return null;
     }
-    
+
     /**
      * 根据业务数据获取目标部门ID
      */
-    private Long getTargetDeptIdFromBusinessData(Object businessData)
-    {
+    private Long getTargetDeptIdFromBusinessData(Object businessData) {
         if (businessData instanceof String) {
             try {
                 String businessDataStr = (String) businessData;
@@ -421,17 +406,16 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                 return null;
             }
         }
-        
+
         return null;
     }
-    
+
     /**
      * 根据业务数据获取原始操作者ID列表（用于班组长整改完成后回流）
      */
-    private List<Long> getOriginalOperatorIdsByBusinessData(Object businessData)
-    {
+    private List<Long> getOriginalOperatorIdsByBusinessData(Object businessData) {
         List<Long> operatorIds = new ArrayList<>();
-        
+
         if (businessData instanceof String) {
             try {
                 String businessDataStr = (String) businessData;
@@ -452,17 +436,16 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                 // 解析失败，返回空列表
             }
         }
-        
+
         return operatorIds;
     }
-    
+
     /**
      * 根据业务数据获取指定部门的科长ID列表
      */
-    private List<Long> getDeptSectionLeaderIdsByBusinessData(Object businessData)
-    {
+    private List<Long> getDeptSectionLeaderIdsByBusinessData(Object businessData) {
         List<Long> sectionLeaderIds = new ArrayList<>();
-        
+
         if (businessData instanceof String) {
             try {
                 String businessDataStr = (String) businessData;
@@ -473,11 +456,11 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                     java.util.regex.Matcher matcher = pattern.matcher(businessDataStr);
                     if (matcher.find()) {
                         Long deptId = Long.valueOf(matcher.group(1));
-                        
+
                         // 获取指定部门下具有科长角色的用户
                         List<Long> kezhangRoleIds = getUserIdsByRoleKey("kezhang");
                         List<SysUser> deptUsers = userMapper.selectUsersByDeptId(deptId);
-                        
+
                         // 找到交集：既在指定部门，又是科长角色的用户
                         for (SysUser user : deptUsers) {
                             if (kezhangRoleIds.contains(user.getUserId())) {
@@ -490,29 +473,28 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                 // 解析失败，返回空列表
             }
         }
-        
+
         return sectionLeaderIds;
     }
-    
+
     /**
      * 根据任务ID获取原始操作者（创建者或更新者）的用户ID
      */
     @Override
-    public Long getOriginalOperatorByTaskId(Long taskId)
-    {
+    public Long getOriginalOperatorByTaskId(Long taskId) {
         if (taskId == null) {
             return null;
         }
-        
+
         // 查找当前任务
         ApprovalTask currentTask = taskMapper.selectApprovalTaskById(taskId);
         if (currentTask == null) {
             return null;
         }
-        
+
         // 获取同一实例的所有历史任务，按创建时间排序
         List<ApprovalTask> instanceTasks = taskMapper.selectApprovalTaskByInstanceId(currentTask.getInstanceId());
-        
+
         // 查找最早的科长审批任务（SECTION_LEADER节点）
         for (ApprovalTask task : instanceTasks) {
             if (task.getCreateBy() != null) {
@@ -523,7 +505,7 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                 }
             }
         }
-        
+
         // 如果找不到科长任务，查找实例的提交者（通常提交后会有科长审批）
         if (currentTask.getInstanceId() != null) {
             ApprovalInstance instance = instanceMapper.selectApprovalInstanceById(currentTask.getInstanceId());
@@ -532,26 +514,25 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                 return getSectionLeaderIdsByUserId(instance.getSubmitterId()).stream().findFirst().orElse(null);
             }
         }
-        
+
         return null;
     }
-    
+
     /**
      * 根据任务ID获取任务的创建者或更新者用户ID（用于驳回回流）
      */
     @Override
-    public Long getTaskCreatorOrUpdaterByTaskId(Long taskId)
-    {
+    public Long getTaskCreatorOrUpdaterByTaskId(Long taskId) {
         if (taskId == null) {
             return null;
         }
-        
+
         // 查找当前任务
         ApprovalTask currentTask = taskMapper.selectApprovalTaskById(taskId);
         if (currentTask == null) {
             return null;
         }
-        
+
         // 如果没有更新者，查找create_by（创建者）
         if (currentTask.getCreateBy() != null && !currentTask.getCreateBy().isEmpty()) {
             SysUser user = userMapper.selectUserByUserName(currentTask.getCreateBy());
@@ -559,23 +540,22 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
                 return user.getUserId();
             }
         }
-        
+
         return null;
     }
-    
+
     /**
      * 根据用户ID查找其直接上级（违禁品审批用）
      * 如果用户是安检员，找其班组长；如果是班组长，找其科长
      */
     @Override
-    public List<Long> getDirectSuperiorIds(Long userId)
-    {
+    public List<Long> getDirectSuperiorIds(Long userId) {
         List<Long> superiorIds = new ArrayList<>();
-        
+
         if (userId == null) {
             return superiorIds;
         }
-        
+
         // 判断用户角色
         if (isGroupLeader(userId)) {
             // 如果是班组长，找其科长
@@ -586,7 +566,7 @@ public class ApprovalUserServiceImpl implements IApprovalUserService
             List<Long> groupLeaderIds = getGroupLeaderIdsByUserId(userId);
             superiorIds.addAll(groupLeaderIds);
         }
-        
+
         return superiorIds;
     }
 }

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

@@ -1,6 +1,7 @@
 package com.sundot.airport.system.service.approval.impl;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.sundot.airport.system.mapper.approval.ApprovalWorkflowDefinitionMapper;
@@ -9,109 +10,100 @@ import com.sundot.airport.system.service.approval.IApprovalWorkflowService;
 
 /**
  * 审批流程定义Service业务层处理
- * 
+ *
  * @author simon lin
  * @date 2025-09-06
  */
 @Service
-public class ApprovalWorkflowServiceImpl implements IApprovalWorkflowService
-{
+public class ApprovalWorkflowServiceImpl implements IApprovalWorkflowService {
     @Autowired
     private ApprovalWorkflowDefinitionMapper approvalWorkflowDefinitionMapper;
 
     /**
      * 查询审批流程定义
-     * 
+     *
      * @param id 审批流程定义主键
      * @return 审批流程定义
      */
     @Override
-    public ApprovalWorkflowDefinition selectApprovalWorkflowDefinitionById(Long id)
-    {
+    public ApprovalWorkflowDefinition selectApprovalWorkflowDefinitionById(Long id) {
         return approvalWorkflowDefinitionMapper.selectApprovalWorkflowDefinitionById(id);
     }
 
     /**
      * 根据流程代码查询审批流程定义
-     * 
+     *
      * @param workflowCode 流程代码
      * @return 审批流程定义
      */
     @Override
-    public ApprovalWorkflowDefinition selectApprovalWorkflowDefinitionByCode(String workflowCode)
-    {
+    public ApprovalWorkflowDefinition selectApprovalWorkflowDefinitionByCode(String workflowCode) {
         return approvalWorkflowDefinitionMapper.selectApprovalWorkflowDefinitionByCode(workflowCode);
     }
 
     /**
      * 根据流程类型查询审批流程定义列表
-     * 
+     *
      * @param workflowType 流程类型
      * @return 审批流程定义列表
      */
     @Override
-    public List<ApprovalWorkflowDefinition> selectApprovalWorkflowDefinitionByType(String workflowType)
-    {
+    public List<ApprovalWorkflowDefinition> selectApprovalWorkflowDefinitionByType(String workflowType) {
         return approvalWorkflowDefinitionMapper.selectApprovalWorkflowDefinitionByType(workflowType);
     }
 
     /**
      * 查询审批流程定义列表
-     * 
+     *
      * @param approvalWorkflowDefinition 审批流程定义
      * @return 审批流程定义
      */
     @Override
-    public List<ApprovalWorkflowDefinition> selectApprovalWorkflowDefinitionList(ApprovalWorkflowDefinition approvalWorkflowDefinition)
-    {
+    public List<ApprovalWorkflowDefinition> selectApprovalWorkflowDefinitionList(ApprovalWorkflowDefinition approvalWorkflowDefinition) {
         return approvalWorkflowDefinitionMapper.selectApprovalWorkflowDefinitionList(approvalWorkflowDefinition);
     }
 
     /**
      * 新增审批流程定义
-     * 
+     *
      * @param approvalWorkflowDefinition 审批流程定义
      * @return 结果
      */
     @Override
-    public int insertApprovalWorkflowDefinition(ApprovalWorkflowDefinition approvalWorkflowDefinition)
-    {
+    public int insertApprovalWorkflowDefinition(ApprovalWorkflowDefinition approvalWorkflowDefinition) {
         return approvalWorkflowDefinitionMapper.insertApprovalWorkflowDefinition(approvalWorkflowDefinition);
     }
 
     /**
      * 修改审批流程定义
-     * 
+     *
      * @param approvalWorkflowDefinition 审批流程定义
      * @return 结果
      */
     @Override
-    public int updateApprovalWorkflowDefinition(ApprovalWorkflowDefinition approvalWorkflowDefinition)
-    {
+    public int updateApprovalWorkflowDefinition(ApprovalWorkflowDefinition approvalWorkflowDefinition) {
         return approvalWorkflowDefinitionMapper.updateApprovalWorkflowDefinition(approvalWorkflowDefinition);
     }
 
     /**
      * 批量删除审批流程定义
-     * 
+     *
      * @param ids 需要删除的审批流程定义主键
      * @return 结果
      */
     @Override
-    public int deleteApprovalWorkflowDefinitionByIds(Long[] ids)
-    {
+    public int deleteApprovalWorkflowDefinitionByIds(Long[] ids) {
         return approvalWorkflowDefinitionMapper.deleteApprovalWorkflowDefinitionByIds(ids);
     }
 
     /**
      * 删除审批流程定义信息
-     * 
+     *
      * @param id 审批流程定义主键
      * @return 结果
      */
     @Override
-    public int deleteApprovalWorkflowDefinitionById(Long id)
-    {
+    public int deleteApprovalWorkflowDefinitionById(Long id) {
         return approvalWorkflowDefinitionMapper.deleteApprovalWorkflowDefinitionById(id);
     }
 }

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

@@ -25,40 +25,40 @@ import java.util.Map;
 
 /**
  * 审批检查服务实现类
- * 
+ *
  * @author Simon Lin
  */
 @Service
 public class CheckApprovalServiceImpl implements ICheckApprovalService {
-    
+
     private static final Logger logger = LoggerFactory.getLogger(CheckApprovalServiceImpl.class);
-    
+
     @Autowired
     private IApprovalEngineService approvalEngineService;
-    
+
     @Autowired
     private ApprovalTaskMapper approvalTaskMapper;
-    
+
     @Autowired
     private ApprovalCcMapper approvalCcMapper;
-    
+
     @Autowired
     private ApprovalHistoryMapper approvalHistoryMapper;
-    
+
     @Autowired
     private ApprovalInstanceMapper approvalInstanceMapper;
-    
+
     @Override
     public ApprovalInstance submitPersonalCheck(Map<String, Object> requestData, Long userId, String username, String remark) throws Exception {
         // 提取系统控制参数
         String checkType = (String) requestData.get("checkType");
         String location = (String) requestData.get("location");
-        
+
         // 新的参数：问题人ID和审批科长ID
         Object problemUserIdObj = requestData.get("problemUserId");
         Object sectionLeaderIdObj = requestData.get("sectionLeaderId");
         Object businessIdObj = requestData.get("businessId");
-        
+
         if (businessIdObj == null) {
             throw new Exception("businessId参数不能为空");
         }
@@ -76,27 +76,27 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         } else if (businessIdObj instanceof String) {
             businessId = Long.parseLong((String) businessIdObj);
         }
-        
+
         Long problemUserId = null;
         if (problemUserIdObj instanceof Number) {
             problemUserId = ((Number) problemUserIdObj).longValue();
         } else if (problemUserIdObj instanceof String) {
             problemUserId = Long.parseLong((String) problemUserIdObj);
         }
-        
+
         Long sectionLeaderId = null;
         if (sectionLeaderIdObj instanceof Number) {
             sectionLeaderId = ((Number) sectionLeaderIdObj).longValue();
         } else if (sectionLeaderIdObj instanceof String) {
             sectionLeaderId = Long.parseLong((String) sectionLeaderIdObj);
         }
-        
+
         // 提取用户表单数据
         Map<String, Object> userFormData = (Map<String, Object>) requestData.get("formData");
         if (userFormData == null) {
             userFormData = new HashMap<>();
         }
-        
+
         Map<String, Object> params = new HashMap<>();
         params.put("businessType", "PERSONAL_CHECK");
         params.put("businessId", businessId);
@@ -105,11 +105,11 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         params.put("location", location);
         params.put("problemUserId", problemUserId);
         params.put("sectionLeaderId", sectionLeaderId);
-        
+
         // 组装最终的表单数据（保留用户填写的所有字段）
         Map<String, Object> formData = new HashMap<>(userFormData);
         params.put("formData", formData);
-        
+
         // 业务数据（用于系统控制）
         Map<String, Object> businessData = new HashMap<>();
         businessData.put("checkType", checkType);
@@ -118,19 +118,19 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         businessData.put("sectionLeaderId", sectionLeaderId);
         businessData.put("initiatorId", userId); // 发起人ID，用于最后的审批环节
         params.put("businessData", businessData);
-        
+
         return approvalEngineService.startPersonalLevelProcess(
-            (String) params.get("businessType"),
-            (Long) params.get("businessId"),
-            (String) params.get("title"),
-            userId,
-            username,
-            sectionLeaderId, // 第一个审批节点分配给科长
-            formData,
-            businessData
+                (String) params.get("businessType"),
+                (Long) params.get("businessId"),
+                (String) params.get("title"),
+                userId,
+                username,
+                sectionLeaderId, // 第一个审批节点分配给科长
+                formData,
+                businessData
         );
     }
-    
+
     @Override
     public ApprovalInstance submitSectionCheck(Map<String, Object> requestData, Long userId, String username, String remark) throws Exception {
         // 提取系统控制参数
@@ -139,24 +139,24 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         Object targetDeptIdObj = requestData.get("targetDeptId");
         Object sectionLeaderIdObj = requestData.get("sectionLeaderId");
         Object businessIdObj = requestData.get("businessId");
-        
+
         if (businessIdObj == null) {
             throw new Exception("businessId参数不能为空");
         }
-        
+
         Long businessId = null;
         if (businessIdObj instanceof Number) {
             businessId = ((Number) businessIdObj).longValue();
         } else if (businessIdObj instanceof String) {
             businessId = Long.parseLong((String) businessIdObj);
         }
-        
+
         // 提取用户表单数据
         Map<String, Object> userFormData = (Map<String, Object>) requestData.get("formData");
         if (userFormData == null) {
             userFormData = new HashMap<>();
         }
-        
+
         Long targetDeptId = null;
         if (targetDeptIdObj != null) {
             if (targetDeptIdObj instanceof Number) {
@@ -165,7 +165,7 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
                 targetDeptId = Long.parseLong((String) targetDeptIdObj);
             }
         }
-        
+
         Long sectionLeaderId = null;
         if (sectionLeaderIdObj != null) {
             if (sectionLeaderIdObj instanceof Number) {
@@ -174,14 +174,14 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
                 sectionLeaderId = Long.parseLong((String) sectionLeaderIdObj);
             }
         }
-        
+
         if (sectionLeaderId == null) {
             throw new Exception("sectionLeaderId参数不能为空");
         }
-        
+
         // 生成业务ID
         //Long businessId = System.currentTimeMillis();
-        
+
         Map<String, Object> params = new HashMap<>();
         params.put("businessType", "SECTION_CHECK");
         params.put("businessId", businessId);
@@ -189,11 +189,11 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         params.put("checkType", checkType);
         params.put("severity", severity);
         params.put("targetDeptId", targetDeptId);
-        
+
         // 组装最终的表单数据
         Map<String, Object> formData = new HashMap<>(userFormData);
         params.put("formData", formData);
-        
+
         // 业务数据
         Map<String, Object> businessData = new HashMap<>();
         businessData.put("checkType", checkType);
@@ -203,19 +203,19 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         }
         businessData.put("sectionLeaderId", sectionLeaderId);
         params.put("businessData", businessData);
-        
+
         return approvalEngineService.startSectionLevelProcess(
-            (String) params.get("businessType"),
-            (Long) params.get("businessId"),
-            (String) params.get("title"),
-            userId,
-            username,
-            sectionLeaderId,
-            formData,
-            businessData
+                (String) params.get("businessType"),
+                (Long) params.get("businessId"),
+                (String) params.get("title"),
+                userId,
+                username,
+                sectionLeaderId,
+                formData,
+                businessData
         );
     }
-    
+
     @Override
     public ApprovalInstance submitGroupCheck(Map<String, Object> requestData, Long userId, String username, String remark) throws Exception {
         // 提取系统控制参数
@@ -223,24 +223,24 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         String severity = (String) requestData.get("severity");
         Object groupLeaderIdObj = requestData.get("groupLeaderId");
         Object businessIdObj = requestData.get("businessId");
-        
+
         if (businessIdObj == null) {
             throw new Exception("businessId参数不能为空");
         }
-        
+
         Long businessId = null;
         if (businessIdObj instanceof Number) {
             businessId = ((Number) businessIdObj).longValue();
         } else if (businessIdObj instanceof String) {
             businessId = Long.parseLong((String) businessIdObj);
         }
-        
+
         // 提取用户表单数据
         Map<String, Object> userFormData = (Map<String, Object>) requestData.get("formData");
         if (userFormData == null) {
             userFormData = new HashMap<>();
         }
-        
+
         Long groupLeaderId = null;
         if (groupLeaderIdObj != null) {
             if (groupLeaderIdObj instanceof Number) {
@@ -249,14 +249,14 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
                 groupLeaderId = Long.parseLong((String) groupLeaderIdObj);
             }
         }
-        
+
         if (groupLeaderId == null) {
             throw new Exception("groupLeaderId参数不能为空");
         }
-        
+
         // 生成业务ID
         //Long businessId = System.currentTimeMillis();
-        
+
         Map<String, Object> params = new HashMap<>();
         params.put("businessType", "GROUP_CHECK");
         params.put("businessId", businessId);
@@ -264,29 +264,29 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         params.put("checkType", checkType);
         params.put("severity", severity);
         params.put("groupLeaderId", groupLeaderId);
-        
+
         // 组装表单数据
         Map<String, Object> formData = new HashMap<>(userFormData);
         params.put("formData", formData);
-        
+
         // 业务数据
         Map<String, Object> businessData = new HashMap<>();
         businessData.put("checkType", checkType);
         businessData.put("severity", severity);
         businessData.put("groupLeaderId", groupLeaderId);
         params.put("businessData", businessData);
-        
+
         return approvalEngineService.startGroupLevelProcess(
-            (String) params.get("businessType"),
-            (Long) params.get("businessId"),
-            (String) params.get("title"),
-            userId,
-            username,
-            formData,
-            businessData
+                (String) params.get("businessType"),
+                (Long) params.get("businessId"),
+                (String) params.get("title"),
+                userId,
+                username,
+                formData,
+                businessData
         );
     }
-    
+
     @Override
     public ApprovalInstance submitSeizureReport(Map<String, Object> requestData, Long userId, String username, String remark) throws Exception {
         // 提取系统控制参数
@@ -294,24 +294,24 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         String passengerInfo = (String) requestData.get("passengerInfo");
         String submitterRole = (String) requestData.get("submitterRole");
         Object businessIdObj = requestData.get("businessId");
-        
+
         if (businessIdObj == null) {
             throw new Exception("businessId参数不能为空");
         }
-        
+
         Long businessId = null;
         if (businessIdObj instanceof Number) {
             businessId = ((Number) businessIdObj).longValue();
         } else if (businessIdObj instanceof String) {
             businessId = Long.parseLong((String) businessIdObj);
         }
-        
+
         // 提取用户表单数据
         Map<String, Object> userFormData = (Map<String, Object>) requestData.get("formData");
         if (userFormData == null) {
             userFormData = new HashMap<>();
         }
-        
+
         // 处理查获时间
         Date seizureTime = null;
         if (seizureTimeObj != null) {
@@ -326,20 +326,20 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
                 }
             }
         }
-        
+
         // 生成业务ID
         //Long businessId = System.currentTimeMillis();
-        
+
         Map<String, Object> params = new HashMap<>();
         params.put("businessType", "SEIZURE_REPORT");
         params.put("businessId", businessId);
         params.put("title", "查获物品上报");
         params.put("submitterRole", submitterRole);
-        
+
         // 组装表单数据
         Map<String, Object> formData = new HashMap<>(userFormData);
         params.put("formData", formData);
-        
+
         // 业务数据
         Map<String, Object> businessData = new HashMap<>();
         if (seizureTime != null) {
@@ -349,28 +349,28 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
             businessData.put("passengerInfo", passengerInfo);
         }
         params.put("businessData", businessData);
-        
+
         return approvalEngineService.startSeizureReportProcess(
-            (String) params.get("businessType"),
-            (Long) params.get("businessId"),
-            (String) params.get("title"),
-            userId,
-            username,
-            submitterRole,
-            formData,
-            businessData
+                (String) params.get("businessType"),
+                (Long) params.get("businessId"),
+                (String) params.get("title"),
+                userId,
+                username,
+                submitterRole,
+                formData,
+                businessData
         );
     }
-    
+
     @Override
     public ApprovalTask approveTask(Long taskId, String comment, Map<String, Object> formData, Long userId, String username) throws Exception {
         if (formData == null) {
             formData = new HashMap<>();
         }
-        
+
         Map<String, Object> params = new HashMap<>();
         params.put("comment", comment);
-        
+
         boolean success = approvalEngineService.approveTask(taskId, userId, username, comment, formData);
         if (success) {
             // 获取更新后的任务信息
@@ -379,7 +379,7 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
             throw new Exception("审批任务失败");
         }
     }
-    
+
     @Override
     public ApprovalTask rejectTask(Long taskId, String comment, Long userId, String username) throws Exception {
         boolean success = approvalEngineService.rejectTask(taskId, userId, username, comment);
@@ -390,47 +390,47 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
             throw new Exception("驳回任务失败");
         }
     }
-    
+
     @Override
     public List<ApprovalTask> getPendingTasks(Long userId) throws Exception {
         return approvalEngineService.getUserPendingTasks(userId);
     }
-    
+
     @Override
     public List<ApprovalTask> getCompletedTasks(Long userId) throws Exception {
         return approvalEngineService.getUserCompletedTasks(userId);
     }
-    
+
     @Override
     public List<ApprovalInstance> getSubmittedInstances(Long userId, String status) throws Exception {
         return approvalEngineService.getUserSubmittedInstances(userId, status);
     }
-    
+
     @Override
     public Long getPendingTaskCount(Long userId) throws Exception {
         List<ApprovalTask> tasks = approvalEngineService.getUserPendingTasks(userId);
         return (long) tasks.size();
     }
-    
+
     @Override
     public List<com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO> getCcDetailsByUserId(Long userId) throws Exception {
         // 1. 获取用户抄送记录（关联实例信息） - 这个查询会被PageHelper拦截进行分页
         List<ApprovalCc> ccList = approvalCcMapper.selectCcDetailsByUserId(userId);
-        
+
         // 2. 转换为DTO并获取历史记录
         List<com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO> resultList = new ArrayList<>();
-        
+
         for (ApprovalCc cc : ccList) {
-            com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO dto = 
-                new com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO();
-            
+            com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO dto =
+                    new com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO();
+
             // 设置抄送信息
             dto.setCcId(cc.getId());
             dto.setInstanceId(cc.getInstanceId());
             dto.setCcTime(cc.getCcTime());
             dto.setIsRead(cc.getIsRead());
             dto.setReadTime(cc.getReadTime());
-            
+
             // 设置实例信息
             if (cc.getInstance() != null) {
                 dto.setTitle(cc.getInstance().getTitle());
@@ -439,47 +439,47 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
                 dto.setBusinessType(cc.getInstance().getBusinessType());
                 dto.setFormData(cc.getInstance().getFormData());
             }
-            
+
             // 获取历史记录
             List<ApprovalHistory> historyList = approvalHistoryMapper.selectApprovalHistoryByInstanceId(cc.getInstanceId());
-            List<com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO.ApprovalHistoryDetailDTO> historyDetailList = 
-                new ArrayList<>();
-            
+            List<com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO.ApprovalHistoryDetailDTO> historyDetailList =
+                    new ArrayList<>();
+
             for (ApprovalHistory history : historyList) {
-                com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO.ApprovalHistoryDetailDTO historyDto = 
-                    new com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO.ApprovalHistoryDetailDTO();
-                
+                com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO.ApprovalHistoryDetailDTO historyDto =
+                        new com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO.ApprovalHistoryDetailDTO();
+
                 historyDto.setNodeName(history.getNodeName());
                 historyDto.setOperatorName(history.getOperatorName());
                 historyDto.setOperationTime(history.getOperationTime());
                 historyDto.setComment(history.getComment());
-                
+
                 historyDetailList.add(historyDto);
             }
-            
+
             dto.setHistoryList(historyDetailList);
             resultList.add(dto);
         }
-        
+
         // 3. 创建一个新的具有分页信息的列表，用于让PageInfo获取正确的分页信息
         // 我们需要将ccList的分页信息传递给resultList
         if (ccList instanceof com.github.pagehelper.Page) {
             com.github.pagehelper.Page<ApprovalCc> pagedCcList = (com.github.pagehelper.Page<ApprovalCc>) ccList;
-            com.github.pagehelper.Page<com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO> pagedResultList = 
-                new com.github.pagehelper.Page<>(pagedCcList.getPageNum(), pagedCcList.getPageSize());
+            com.github.pagehelper.Page<com.sundot.airport.system.domain.approval.dto.ApprovalCcDetailDTO> pagedResultList =
+                    new com.github.pagehelper.Page<>(pagedCcList.getPageNum(), pagedCcList.getPageSize());
             pagedResultList.setTotal(pagedCcList.getTotal());
             pagedResultList.addAll(resultList);
             return pagedResultList;
         }
-        
+
         return resultList;
     }
-    
+
     @Override
     public List<ApprovalHistory> getApprovalHistoryByInstanceId(Long instanceId) throws Exception {
         try {
             List<ApprovalHistory> historyList = approvalHistoryMapper.selectApprovalHistoryByInstanceId(instanceId);
-            
+
             // 检查审批实例是否完成
             ApprovalInstance instance = approvalInstanceMapper.selectApprovalInstanceById(instanceId);
             if (instance != null && !"COMPLETED".equals(instance.getStatus()) && !"REJECTED".equals(instance.getStatus()) && !"CANCELLED".equals(instance.getStatus())) {
@@ -488,7 +488,7 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
                 pendingTask.setInstanceId(instanceId);
                 pendingTask.setStatus("PENDING");
                 List<ApprovalTask> pendingTasks = approvalTaskMapper.selectApprovalTaskList(pendingTask);
-                
+
                 if (!pendingTasks.isEmpty()) {
                     // 将待办任务转换为审批历史记录格式并添加到列表末尾
                     ApprovalTask task = pendingTasks.get(0); // 通常只有一个当前待办任务
@@ -503,17 +503,17 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
                     pendingHistory.setOperationTime(task.getAssignTime());
                     pendingHistory.setComment("待处理");
                     pendingHistory.setFormData(task.getFormData());
-                    
+
                     historyList.add(pendingHistory);
                 }
             }
-            
+
             return historyList;
         } catch (Exception e) {
             throw new Exception("根据实例ID查询审批历史失败：" + e.getMessage(), e);
         }
     }
-    
+
     @Override
     public List<ApprovalHistory> getApprovalHistoryByTaskId(Long taskId) throws Exception {
         try {
@@ -522,7 +522,7 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
             throw new Exception("根据任务ID查询审批历史失败：" + e.getMessage(), e);
         }
     }
-    
+
     @Override
     public List<ApprovalHistory> getUserApprovalHistory(Long userId, String action) throws Exception {
         try {
@@ -531,7 +531,7 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
             throw new Exception("查询用户审批历史失败：" + e.getMessage(), e);
         }
     }
-    
+
     @Override
     public int batchUpdateCcReadStatus(List<Long> ids) throws Exception {
         try {

airport-system/src/main/resources/mapper/approval/ApprovalCcMapper.xml

@@ -1,95 +1,108 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundot.airport.system.mapper.approval.ApprovalCcMapper">
-    
+
     <resultMap type="ApprovalCc" id="ApprovalCcResult">
-        <id     property="id"           column="id"             />
-        <result property="instanceId"   column="instance_id"    />
-        <result property="ccUserId"     column="cc_user_id"     />
-        <result property="ccUserName"   column="cc_user_name"   />
-        <result property="ccTime"       column="cc_time"        />
-        <result property="isRead"       column="is_read"        />
-        <result property="readTime"     column="read_time"      />
-        <result property="createBy"     column="create_by"      />
-        <result property="createTime"   column="create_time"    />
-        <result property="remark"       column="remark"         />
+        <id property="id" column="id"/>
+        <result property="instanceId" column="instance_id"/>
+        <result property="ccUserId" column="cc_user_id"/>
+        <result property="ccUserName" column="cc_user_name"/>
+        <result property="ccTime" column="cc_time"/>
+        <result property="isRead" column="is_read"/>
+        <result property="readTime" column="read_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
-    
+
     <resultMap id="InstanceResult" type="ApprovalInstance">
-        <id     property="id"               column="instance_id"        />
-        <result property="instanceNo"       column="instance_no"        />
-        <result property="title"            column="title"              />
-        <result property="businessType"     column="business_type"      />
-        <result property="status"           column="status"             />
-        <result property="submitTime"       column="submit_time"        />
-        <result property="completionTime"   column="completion_time"    />
+        <id property="id" column="instance_id"/>
+        <result property="instanceNo" column="instance_no"/>
+        <result property="title" column="title"/>
+        <result property="businessType" column="business_type"/>
+        <result property="status" column="status"/>
+        <result property="submitTime" column="submit_time"/>
+        <result property="completionTime" column="completion_time"/>
     </resultMap>
 
     <resultMap id="ApprovalCcWithInstanceResult" type="ApprovalCc">
-        <id     property="id"           column="id"             />
-        <result property="instanceId"   column="instance_id"    />
-        <result property="ccUserId"     column="cc_user_id"     />
-        <result property="ccUserName"   column="cc_user_name"   />
-        <result property="ccTime"       column="cc_time"        />
-        <result property="isRead"       column="is_read"        />
-        <result property="readTime"     column="read_time"      />
-        <result property="createBy"     column="create_by"      />
-        <result property="createTime"   column="create_time"    />
-        <result property="remark"       column="remark"         />
+        <id property="id" column="id"/>
+        <result property="instanceId" column="instance_id"/>
+        <result property="ccUserId" column="cc_user_id"/>
+        <result property="ccUserName" column="cc_user_name"/>
+        <result property="ccTime" column="cc_time"/>
+        <result property="isRead" column="is_read"/>
+        <result property="readTime" column="read_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
         <association property="instance" javaType="ApprovalInstance">
-            <id     property="id"               column="ai_id"              />
-            <result property="instanceNo"       column="ai_instance_no"     />
-            <result property="title"            column="ai_title"           />
-            <result property="businessId"       column="ai_business_id"     />
-            <result property="businessType"     column="ai_business_type"   />
-            <result property="status"           column="ai_status"          />
-            <result property="submitTime"       column="ai_submit_time"     />
-            <result property="completionTime"   column="ai_completion_time" />
-            <result property="formData"         column="ai_form_data"       />
+            <id property="id" column="ai_id"/>
+            <result property="instanceNo" column="ai_instance_no"/>
+            <result property="title" column="ai_title"/>
+            <result property="businessId" column="ai_business_id"/>
+            <result property="businessType" column="ai_business_type"/>
+            <result property="status" column="ai_status"/>
+            <result property="submitTime" column="ai_submit_time"/>
+            <result property="completionTime" column="ai_completion_time"/>
+            <result property="formData" column="ai_form_data"/>
         </association>
     </resultMap>
 
     <sql id="selectApprovalCcVo">
-        select id, instance_id, cc_user_id, cc_user_name, cc_time, is_read, read_time, create_by, create_time, remark from approval_cc
+        select id,
+               instance_id,
+               cc_user_id,
+               cc_user_name,
+               cc_time,
+               is_read,
+               read_time,
+               create_by,
+               create_time,
+               remark
+        from approval_cc
     </sql>
 
     <select id="selectApprovalCcList" parameterType="ApprovalCc" resultMap="ApprovalCcResult">
         <include refid="selectApprovalCcVo"/>
-        <where>  
-            <if test="instanceId != null "> and instance_id = #{instanceId}</if>
-            <if test="ccUserId != null "> and cc_user_id = #{ccUserId}</if>
-            <if test="ccUserName != null  and ccUserName != ''"> and cc_user_name like concat('%', #{ccUserName}, '%')</if>
-            <if test="isRead != null  and isRead != ''"> and is_read = #{isRead}</if>
-            <if test="params.beginCcTime != null and params.beginCcTime != '' and params.endCcTime != null and params.endCcTime != ''"> and cc_time between #{params.beginCcTime} and #{params.endCcTime}</if>
+        <where>
+            <if test="instanceId != null ">and instance_id = #{instanceId}</if>
+            <if test="ccUserId != null ">and cc_user_id = #{ccUserId}</if>
+            <if test="ccUserName != null  and ccUserName != ''">and cc_user_name like concat('%', #{ccUserName}, '%')
+            </if>
+            <if test="isRead != null  and isRead != ''">and is_read = #{isRead}</if>
+            <if test="params.beginCcTime != null and params.beginCcTime != '' and params.endCcTime != null and params.endCcTime != ''">
+                and cc_time between #{params.beginCcTime} and #{params.endCcTime}
+            </if>
         </where>
     </select>
-    
+
     <select id="selectApprovalCcById" parameterType="Long" resultMap="ApprovalCcResult">
         <include refid="selectApprovalCcVo"/>
         where id = #{id}
     </select>
-    
+
     <select id="selectApprovalCcByInstanceId" parameterType="Long" resultMap="ApprovalCcResult">
         <include refid="selectApprovalCcVo"/>
         where instance_id = #{instanceId}
         order by cc_time desc
     </select>
-    
+
     <select id="selectApprovalCcByCcUser" resultMap="ApprovalCcResult">
         <include refid="selectApprovalCcVo"/>
         where cc_user_id = #{ccUserId}
-        <if test="isRead != null and isRead != ''"> and is_read = #{isRead}</if>
+        <if test="isRead != null and isRead != ''">and is_read = #{isRead}</if>
         order by cc_time desc
     </select>
-    
+
     <select id="countCcMessagesByCcUser" resultType="int">
         select count(*) from approval_cc
         where cc_user_id = #{ccUserId}
-        <if test="isRead != null and isRead != ''"> and is_read = #{isRead}</if>
+        <if test="isRead != null and isRead != ''">and is_read = #{isRead}</if>
     </select>
-        
+
     <insert id="insertApprovalCc" parameterType="ApprovalCc" useGeneratedKeys="true" keyProperty="id">
         insert into approval_cc
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -102,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="instanceId != null">#{instanceId},</if>
             <if test="ccUserId != null">#{ccUserId},</if>
@@ -113,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateApprovalCc" parameterType="ApprovalCc">
@@ -133,38 +146,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteApprovalCcById" parameterType="Long">
-        delete from approval_cc where id = #{id}
+        delete
+        from approval_cc
+        where id = #{id}
     </delete>
 
     <delete id="deleteApprovalCcByIds" parameterType="String">
-        delete from approval_cc where id in 
+        delete from approval_cc where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
+
     <delete id="deleteApprovalCcByInstanceId" parameterType="Long">
-        delete from approval_cc where instance_id = #{instanceId}
+        delete
+        from approval_cc
+        where instance_id = #{instanceId}
     </delete>
-    
+
     <select id="selectCcDetailsByUserId" parameterType="Long" resultMap="ApprovalCcWithInstanceResult">
-        select 
-            ac.id, ac.instance_id, ac.cc_user_id, ac.cc_user_name, ac.cc_time, 
-            ac.is_read, ac.read_time, ac.create_by, ac.create_time, ac.remark,
-            ai.id as ai_id, ai.instance_no as ai_instance_no, ai.title as ai_title,
-            ai.business_id as ai_business_id, ai.business_type as ai_business_type, 
-            ai.status as ai_status, ai.submit_time as ai_submit_time, ai.completion_time as ai_completion_time,
-            ai.form_data as ai_form_data
+        select ac.id,
+               ac.instance_id,
+               ac.cc_user_id,
+               ac.cc_user_name,
+               ac.cc_time,
+               ac.is_read,
+               ac.read_time,
+               ac.create_by,
+               ac.create_time,
+               ac.remark,
+               ai.id              as ai_id,
+               ai.instance_no     as ai_instance_no,
+               ai.title           as ai_title,
+               ai.business_id     as ai_business_id,
+               ai.business_type   as ai_business_type,
+               ai.status          as ai_status,
+               ai.submit_time     as ai_submit_time,
+               ai.completion_time as ai_completion_time,
+               ai.form_data       as ai_form_data
         from approval_cc ac
-        left join approval_instance ai on ac.instance_id = ai.id
+                 left join approval_instance ai on ac.instance_id = ai.id
         where ac.cc_user_id = #{ccUserId}
         order by ac.cc_time desc
     </select>
-    
+
     <update id="batchUpdateReadStatus" parameterType="list">
-        update approval_cc 
-        set is_read = '1', read_time = sysdate() 
-        where id in 
+        update approval_cc
+        set is_read = '1', read_time = sysdate()
+        where id in
         <foreach collection="list" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>

airport-system/src/main/resources/mapper/approval/ApprovalHistoryMapper.xml

@@ -1,47 +1,56 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundot.airport.system.mapper.approval.ApprovalHistoryMapper">
-    
+
     <resultMap type="ApprovalHistory" id="ApprovalHistoryResult">
-        <result property="id"    column="id"    />
-        <result property="instanceId"    column="instance_id"    />
-        <result property="taskId"    column="task_id"    />
-        <result property="nodeId"    column="node_id"    />
-        <result property="nodeName"    column="node_name"    />
-        <result property="operatorId"    column="operator_id"    />
-        <result property="operatorName"    column="operator_name"    />
-        <result property="action"    column="action"    />
-        <result property="comment"    column="comment"    />
-        <result property="formData"    column="form_data"    />
-        <result property="operationTime"    column="operation_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="instanceId" column="instance_id"/>
+        <result property="taskId" column="task_id"/>
+        <result property="nodeId" column="node_id"/>
+        <result property="nodeName" column="node_name"/>
+        <result property="operatorId" column="operator_id"/>
+        <result property="operatorName" column="operator_name"/>
+        <result property="action" column="action"/>
+        <result property="comment" column="comment"/>
+        <result property="formData" column="form_data"/>
+        <result property="operationTime" column="operation_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectApprovalHistoryVo">
-        select id, instance_id, task_id, node_id, node_name, operator_id, operator_name, action, comment, form_data, operation_time, create_by, create_time, remark from approval_history
+        select id,
+               instance_id,
+               task_id,
+               node_id,
+               node_name,
+               operator_id,
+               operator_name, action, comment, form_data, operation_time, create_by, create_time, remark
+        from approval_history
     </sql>
 
     <select id="selectApprovalHistoryList" parameterType="ApprovalHistory" resultMap="ApprovalHistoryResult">
         <include refid="selectApprovalHistoryVo"/>
-        <where>  
-            <if test="instanceId != null "> and instance_id = #{instanceId}</if>
-            <if test="taskId != null "> and task_id = #{taskId}</if>
-            <if test="nodeId != null "> and node_id = #{nodeId}</if>
-            <if test="nodeName != null  and nodeName != ''"> and node_name like concat('%', #{nodeName}, '%')</if>
-            <if test="operatorId != null "> and operator_id = #{operatorId}</if>
-            <if test="operatorName != null  and operatorName != ''"> and operator_name like concat('%', #{operatorName}, '%')</if>
-            <if test="action != null  and action != ''"> and action = #{action}</if>
-            <if test="comment != null  and comment != ''"> and comment like concat('%', #{comment}, '%')</if>
-            <if test="formData != null  and formData != ''"> and form_data = #{formData}</if>
-            <if test="operationTime != null "> and operation_time = #{operationTime}</if>
+        <where>
+            <if test="instanceId != null ">and instance_id = #{instanceId}</if>
+            <if test="taskId != null ">and task_id = #{taskId}</if>
+            <if test="nodeId != null ">and node_id = #{nodeId}</if>
+            <if test="nodeName != null  and nodeName != ''">and node_name like concat('%', #{nodeName}, '%')</if>
+            <if test="operatorId != null ">and operator_id = #{operatorId}</if>
+            <if test="operatorName != null  and operatorName != ''">and operator_name like concat('%', #{operatorName},
+                '%')
+            </if>
+            <if test="action != null  and action != ''">and action = #{action}</if>
+            <if test="comment != null  and comment != ''">and comment like concat('%', #{comment}, '%')</if>
+            <if test="formData != null  and formData != ''">and form_data = #{formData}</if>
+            <if test="operationTime != null ">and operation_time = #{operationTime}</if>
         </where>
         order by id asc
     </select>
-    
+
     <select id="selectApprovalHistoryById" parameterType="Long" resultMap="ApprovalHistoryResult">
         <include refid="selectApprovalHistoryVo"/>
         where id = #{id}
@@ -67,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by id asc
     </select>
-        
+
     <insert id="insertApprovalHistory" parameterType="ApprovalHistory" useGeneratedKeys="true" keyProperty="id">
         insert into approval_history
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -84,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="instanceId != null">#{instanceId},</if>
             <if test="taskId != null">#{taskId},</if>
@@ -99,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateApprovalHistory" parameterType="ApprovalHistory">
@@ -123,18 +132,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteApprovalHistoryById" parameterType="Long">
-        delete from approval_history where id = #{id}
+        delete
+        from approval_history
+        where id = #{id}
     </delete>
 
     <delete id="deleteApprovalHistoryByIds" parameterType="String">
-        delete from approval_history where id in 
+        delete from approval_history where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
 
     <delete id="deleteApprovalHistoryByInstanceId" parameterType="Long">
-        delete from approval_history where instance_id = #{instanceId}
+        delete
+        from approval_history
+        where instance_id = #{instanceId}
     </delete>
 
 </mapper>

airport-system/src/main/resources/mapper/approval/ApprovalInstanceMapper.xml

@@ -1,88 +1,108 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundot.airport.system.mapper.approval.ApprovalInstanceMapper">
-    
+
     <resultMap type="ApprovalInstance" id="ApprovalInstanceResult">
-        <id     property="id"               column="id"                 />
-        <result property="instanceNo"       column="instance_no"        />
-        <result property="workflowId"       column="workflow_id"        />
-        <result property="title"            column="title"              />
-        <result property="businessType"     column="business_type"      />
-        <result property="businessId"       column="business_id"        />
-        <result property="businessData"     column="business_data"      />
-        <result property="submitterId"      column="submitter_id"       />
-        <result property="submitterName"    column="submitter_name"     />
-        <result property="submitTime"       column="submit_time"        />
-        <result property="currentNodeId"    column="current_node_id"    />
-        <result property="status"           column="status"             />
-        <result property="completionTime"   column="completion_time"    />
-        <result property="urgentLevel"      column="urgent_level"       />
-        <result property="formData"         column="form_data"          />
-        <result property="createBy"         column="create_by"          />
-        <result property="createTime"       column="create_time"        />
-        <result property="updateBy"         column="update_by"          />
-        <result property="updateTime"       column="update_time"        />
-        <result property="remark"           column="remark"             />
-        <association property="workflowDefinition" javaType="ApprovalWorkflowDefinition" resultMap="WorkflowResult" />
-        <association property="currentNode" javaType="ApprovalNodeDefinition" resultMap="NodeResult" />
-        <collection property="tasks"        javaType="java.util.List"   resultMap="TaskResult" />
-        <collection property="histories"    javaType="java.util.List"   resultMap="HistoryResult" />
+        <id property="id" column="id"/>
+        <result property="instanceNo" column="instance_no"/>
+        <result property="workflowId" column="workflow_id"/>
+        <result property="title" column="title"/>
+        <result property="businessType" column="business_type"/>
+        <result property="businessId" column="business_id"/>
+        <result property="businessData" column="business_data"/>
+        <result property="submitterId" column="submitter_id"/>
+        <result property="submitterName" column="submitter_name"/>
+        <result property="submitTime" column="submit_time"/>
+        <result property="currentNodeId" column="current_node_id"/>
+        <result property="status" column="status"/>
+        <result property="completionTime" column="completion_time"/>
+        <result property="urgentLevel" column="urgent_level"/>
+        <result property="formData" column="form_data"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <association property="workflowDefinition" javaType="ApprovalWorkflowDefinition" resultMap="WorkflowResult"/>
+        <association property="currentNode" javaType="ApprovalNodeDefinition" resultMap="NodeResult"/>
+        <collection property="tasks" javaType="java.util.List" resultMap="TaskResult"/>
+        <collection property="histories" javaType="java.util.List" resultMap="HistoryResult"/>
     </resultMap>
-    
+
     <resultMap id="WorkflowResult" type="ApprovalWorkflowDefinition">
-        <id     property="id"               column="workflow_id"        />
-        <result property="workflowCode"     column="workflow_code"      />
-        <result property="workflowName"     column="workflow_name"      />
-        <result property="workflowType"     column="workflow_type"      />
-        <result property="description"      column="workflow_description" />
+        <id property="id" column="workflow_id"/>
+        <result property="workflowCode" column="workflow_code"/>
+        <result property="workflowName" column="workflow_name"/>
+        <result property="workflowType" column="workflow_type"/>
+        <result property="description" column="workflow_description"/>
     </resultMap>
-    
+
     <resultMap id="NodeResult" type="ApprovalNodeDefinition">
-        <id     property="id"               column="current_node_id"    />
-        <result property="nodeCode"         column="current_node_code"  />
-        <result property="nodeName"         column="current_node_name"  />
-        <result property="nodeType"         column="current_node_type"  />
+        <id property="id" column="current_node_id"/>
+        <result property="nodeCode" column="current_node_code"/>
+        <result property="nodeName" column="current_node_name"/>
+        <result property="nodeType" column="current_node_type"/>
     </resultMap>
-    
+
     <resultMap id="TaskResult" type="ApprovalTask">
-        <id     property="id"               column="task_id"            />
-        <result property="taskNo"           column="task_no"            />
-        <result property="taskName"         column="task_name"          />
-        <result property="assigneeId"       column="assignee_id"        />
-        <result property="assigneeName"     column="assignee_name"      />
-        <result property="status"           column="task_status"        />
+        <id property="id" column="task_id"/>
+        <result property="taskNo" column="task_no"/>
+        <result property="taskName" column="task_name"/>
+        <result property="assigneeId" column="assignee_id"/>
+        <result property="assigneeName" column="assignee_name"/>
+        <result property="status" column="task_status"/>
     </resultMap>
-    
+
     <resultMap id="HistoryResult" type="ApprovalHistory">
-        <id     property="id"               column="history_id"         />
-        <result property="action"           column="action"             />
-        <result property="operatorId"       column="operator_id"        />
-        <result property="operatorName"     column="operator_name"      />
-        <result property="operationTime"    column="operation_time"     />
-        <result property="comment"          column="history_comment"    />
+        <id property="id" column="history_id"/>
+        <result property="action" column="action"/>
+        <result property="operatorId" column="operator_id"/>
+        <result property="operatorName" column="operator_name"/>
+        <result property="operationTime" column="operation_time"/>
+        <result property="comment" column="history_comment"/>
     </resultMap>
 
     <sql id="selectApprovalInstanceVo">
-        select id, instance_no, workflow_id, title, business_type, business_id, business_data, 
-               submitter_id, submitter_name, submit_time, current_node_id, status, completion_time, 
-               urgent_level, form_data, create_by, create_time, update_by, update_time, remark 
+        select id,
+               instance_no,
+               workflow_id,
+               title,
+               business_type,
+               business_id,
+               business_data,
+               submitter_id,
+               submitter_name,
+               submit_time,
+               current_node_id,
+               status,
+               completion_time,
+               urgent_level,
+               form_data,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
         from approval_instance
     </sql>
 
     <select id="selectApprovalInstanceList" parameterType="ApprovalInstance" resultMap="ApprovalInstanceResult">
         <include refid="selectApprovalInstanceVo"/>
-        <where>  
-            <if test="instanceNo != null  and instanceNo != ''"> and instance_no like concat('%', #{instanceNo}, '%')</if>
-            <if test="workflowId != null "> and workflow_id = #{workflowId}</if>
-            <if test="title != null  and title != ''"> and title like concat('%', #{title}, '%')</if>
-            <if test="businessType != null  and businessType != ''"> and business_type = #{businessType}</if>
-            <if test="businessId != null "> and business_id = #{businessId}</if>
-            <if test="submitterId != null "> and submitter_id = #{submitterId}</if>
-            <if test="submitterName != null  and submitterName != ''"> and submitter_name like concat('%', #{submitterName}, '%')</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="urgentLevel != null  and urgentLevel != ''"> and urgent_level = #{urgentLevel}</if>
+        <where>
+            <if test="instanceNo != null  and instanceNo != ''">and instance_no like concat('%', #{instanceNo}, '%')
+            </if>
+            <if test="workflowId != null ">and workflow_id = #{workflowId}</if>
+            <if test="title != null  and title != ''">and title like concat('%', #{title}, '%')</if>
+            <if test="businessType != null  and businessType != ''">and business_type = #{businessType}</if>
+            <if test="businessId != null ">and business_id = #{businessId}</if>
+            <if test="submitterId != null ">and submitter_id = #{submitterId}</if>
+            <if test="submitterName != null  and submitterName != ''">and submitter_name like concat('%',
+                #{submitterName}, '%')
+            </if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
+            <if test="urgentLevel != null  and urgentLevel != ''">and urgent_level = #{urgentLevel}</if>
             <if test="params != null and params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 and date_format(submit_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
@@ -92,9 +112,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by submit_time desc
     </select>
-    
+
     <!-- 根据工作流ID列表、时间范围和用户ID列表查询审批实例 -->
-    <select id="selectApprovalInstancesByWorkflowIdsAndTimeRangeAndUsers" parameterType="map" resultMap="ApprovalInstanceResult">
+    <select id="selectApprovalInstancesByWorkflowIdsAndTimeRangeAndUsers" parameterType="map"
+            resultMap="ApprovalInstanceResult">
         <include refid="selectApprovalInstanceVo"/>
         <where>
             <if test="workflowIds != null and workflowIds.size() > 0">
@@ -118,55 +139,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by submit_time desc
     </select>
-    
+
     <!-- 查询部门及其子部门下的所有用户ID -->
     <select id="selectUserIdsByDeptAndSubDepts" parameterType="long" resultType="long">
-        select user_id 
-        from sys_user 
-        where dept_id in (
-            select dept_id
-            from sys_dept
-            where dept_id = #{deptId} 
-               or parent_id = #{deptId} 
-               or ancestors like concat('%,', #{deptId}, ',%') 
-               or ancestors like concat(#{deptId}, ',%')
-               or ancestors like concat('%,', #{deptId})
-               or ancestors = #{deptId}
-        ) and del_flag = '0'
+        select user_id
+        from sys_user
+        where dept_id in (select dept_id
+                          from sys_dept
+                          where dept_id = #{deptId}
+                             or parent_id = #{deptId}
+                             or ancestors like concat('%,', #{deptId}, ',%')
+                             or ancestors like concat(#{deptId}, ',%')
+                             or ancestors like concat('%,', #{deptId})
+                             or ancestors = #{deptId})
+          and del_flag = '0'
     </select>
-    
+
     <select id="selectApprovalInstanceById" parameterType="Long" resultMap="ApprovalInstanceResult">
         <include refid="selectApprovalInstanceVo"/>
         where id = #{id}
     </select>
-    
+
     <select id="selectApprovalInstanceByNo" parameterType="String" resultMap="ApprovalInstanceResult">
         <include refid="selectApprovalInstanceVo"/>
         where instance_no = #{instanceNo}
     </select>
-    
+
     <select id="selectApprovalInstanceByBusiness" resultMap="ApprovalInstanceResult">
         <include refid="selectApprovalInstanceVo"/>
         where business_type = #{businessType} and business_id = #{businessId}
         order by submit_time desc
     </select>
-    
+
     <select id="selectApprovalInstanceBySubmitter" resultMap="ApprovalInstanceResult">
         <include refid="selectApprovalInstanceVo"/>
         where submitter_id = #{submitterId}
-        <if test="status != null and status != ''"> and status = #{status}</if>
+        <if test="status != null and status != ''">and status = #{status}</if>
         order by submit_time desc
     </select>
-    
+
     <select id="selectApprovalInstanceDetail" parameterType="Long" resultMap="ApprovalInstanceResult">
         <include refid="selectApprovalInstanceVo"/>
         where id = #{id}
     </select>
-    
+
     <select id="generateInstanceNo" resultType="String">
         SELECT CONCAT('INST', DATE_FORMAT(NOW(), '%Y%m%d%H%i%s'), LPAD(FLOOR(RAND() * 1000), 3, '0')) AS new_instance_no
     </select>
-        
+
     <insert id="insertApprovalInstance" parameterType="ApprovalInstance" useGeneratedKeys="true" keyProperty="id">
         insert into approval_instance
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -189,7 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="instanceNo != null and instanceNo != ''">#{instanceNo},</if>
             <if test="workflowId != null">#{workflowId},</if>
@@ -210,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateApprovalInstance" parameterType="ApprovalInstance">
@@ -240,11 +260,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteApprovalInstanceById" parameterType="Long">
-        delete from approval_instance where id = #{id}
+        delete
+        from approval_instance
+        where id = #{id}
     </delete>
 
     <delete id="deleteApprovalInstanceByIds" parameterType="String">
-        delete from approval_instance where id in 
+        delete from approval_instance where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

airport-system/src/main/resources/mapper/approval/ApprovalNodeDefinitionMapper.xml

@@ -1,83 +1,100 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundot.airport.system.mapper.approval.ApprovalNodeDefinitionMapper">
-    
+
     <resultMap type="ApprovalNodeDefinition" id="ApprovalNodeDefinitionResult">
-        <id     property="id"               column="id"                 />
-        <result property="workflowId"       column="workflow_id"        />
-        <result property="nodeCode"         column="node_code"          />
-        <result property="nodeName"         column="node_name"          />
-        <result property="nodeType"         column="node_type"          />
-        <result property="sortOrder"        column="sort_order"         />
-        <result property="approverType"     column="approver_type"      />
-        <result property="approverValue"    column="approver_value"     />
-        <result property="canReject"        column="can_reject"         />
-        <result property="isRequired"       column="is_required"        />
-        <result property="timeoutHours"     column="timeout_hours"      />
-        <result property="status"           column="status"             />
-        <result property="createBy"         column="create_by"          />
-        <result property="createTime"       column="create_time"        />
-        <result property="updateBy"         column="update_by"          />
-        <result property="updateTime"       column="update_time"        />
-        <result property="remark"           column="remark"             />
+        <id property="id" column="id"/>
+        <result property="workflowId" column="workflow_id"/>
+        <result property="nodeCode" column="node_code"/>
+        <result property="nodeName" column="node_name"/>
+        <result property="nodeType" column="node_type"/>
+        <result property="sortOrder" column="sort_order"/>
+        <result property="approverType" column="approver_type"/>
+        <result property="approverValue" column="approver_value"/>
+        <result property="canReject" column="can_reject"/>
+        <result property="isRequired" column="is_required"/>
+        <result property="timeoutHours" column="timeout_hours"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectApprovalNodeDefinitionVo">
-        select id, workflow_id, node_code, node_name, node_type, sort_order, approver_type, approver_value, 
-               can_reject, is_required, timeout_hours, status, create_by, create_time, update_by, update_time, remark 
+        select id,
+               workflow_id,
+               node_code,
+               node_name,
+               node_type,
+               sort_order,
+               approver_type,
+               approver_value,
+               can_reject,
+               is_required,
+               timeout_hours,
+               status,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
         from approval_node_definition
     </sql>
 
-    <select id="selectApprovalNodeDefinitionList" parameterType="ApprovalNodeDefinition" resultMap="ApprovalNodeDefinitionResult">
+    <select id="selectApprovalNodeDefinitionList" parameterType="ApprovalNodeDefinition"
+            resultMap="ApprovalNodeDefinitionResult">
         <include refid="selectApprovalNodeDefinitionVo"/>
-        <where>  
-            <if test="workflowId != null "> and workflow_id = #{workflowId}</if>
-            <if test="nodeCode != null  and nodeCode != ''"> and node_code like concat('%', #{nodeCode}, '%')</if>
-            <if test="nodeName != null  and nodeName != ''"> and node_name like concat('%', #{nodeName}, '%')</if>
-            <if test="nodeType != null  and nodeType != ''"> and node_type = #{nodeType}</if>
-            <if test="approverType != null  and approverType != ''"> and approver_type = #{approverType}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+        <where>
+            <if test="workflowId != null ">and workflow_id = #{workflowId}</if>
+            <if test="nodeCode != null  and nodeCode != ''">and node_code like concat('%', #{nodeCode}, '%')</if>
+            <if test="nodeName != null  and nodeName != ''">and node_name like concat('%', #{nodeName}, '%')</if>
+            <if test="nodeType != null  and nodeType != ''">and node_type = #{nodeType}</if>
+            <if test="approverType != null  and approverType != ''">and approver_type = #{approverType}</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
         </where>
         order by workflow_id, sort_order
     </select>
-    
+
     <select id="selectApprovalNodeDefinitionById" parameterType="Long" resultMap="ApprovalNodeDefinitionResult">
         <include refid="selectApprovalNodeDefinitionVo"/>
         where id = #{id}
     </select>
-    
+
     <select id="selectApprovalNodeDefinitionByWorkflowId" parameterType="Long" resultMap="ApprovalNodeDefinitionResult">
         <include refid="selectApprovalNodeDefinitionVo"/>
         where workflow_id = #{workflowId} and status = '0'
         order by sort_order
     </select>
-    
+
     <select id="selectApprovalNodeDefinitionByWorkflowAndCode" resultMap="ApprovalNodeDefinitionResult">
         <include refid="selectApprovalNodeDefinitionVo"/>
         where workflow_id = #{workflowId} and node_code = #{nodeCode} and status = '0'
     </select>
-    
+
     <select id="selectFirstNodeByWorkflowId" parameterType="Long" resultMap="ApprovalNodeDefinitionResult">
         <include refid="selectApprovalNodeDefinitionVo"/>
         where workflow_id = #{workflowId} and status = '0'
         order by sort_order limit 1
     </select>
-    
+
     <select id="selectNextNodeByOrder" resultMap="ApprovalNodeDefinitionResult">
         <include refid="selectApprovalNodeDefinitionVo"/>
         where workflow_id = #{workflowId} and sort_order > #{currentOrder} and status = '0'
         order by sort_order limit 1
     </select>
-    
+
     <select id="selectPreviousNodeByOrder" resultMap="ApprovalNodeDefinitionResult">
         <include refid="selectApprovalNodeDefinitionVo"/>
         where workflow_id = #{workflowId} and sort_order &lt; #{currentOrder} and status = '0'
         order by sort_order desc limit 1
     </select>
-        
-    <insert id="insertApprovalNodeDefinition" parameterType="ApprovalNodeDefinition" useGeneratedKeys="true" keyProperty="id">
+
+    <insert id="insertApprovalNodeDefinition" parameterType="ApprovalNodeDefinition" useGeneratedKeys="true"
+            keyProperty="id">
         insert into approval_node_definition
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="workflowId != null">workflow_id,</if>
@@ -96,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workflowId != null">#{workflowId},</if>
             <if test="nodeCode != null and nodeCode != ''">#{nodeCode},</if>
@@ -114,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateApprovalNodeDefinition" parameterType="ApprovalNodeDefinition">
@@ -141,17 +158,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteApprovalNodeDefinitionById" parameterType="Long">
-        delete from approval_node_definition where id = #{id}
+        delete
+        from approval_node_definition
+        where id = #{id}
     </delete>
 
     <delete id="deleteApprovalNodeDefinitionByIds" parameterType="String">
-        delete from approval_node_definition where id in 
+        delete from approval_node_definition where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
+
     <delete id="deleteApprovalNodeDefinitionByWorkflowId" parameterType="Long">
-        delete from approval_node_definition where workflow_id = #{workflowId}
+        delete
+        from approval_node_definition
+        where workflow_id = #{workflowId}
     </delete>
 </mapper>

airport-system/src/main/resources/mapper/approval/ApprovalTaskMapper.xml

@@ -1,71 +1,89 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundot.airport.system.mapper.approval.ApprovalTaskMapper">
-    
+
     <resultMap type="ApprovalTask" id="ApprovalTaskResult">
-        <id     property="id"               column="id"                 />
-        <result property="taskNo"           column="task_no"            />
-        <result property="instanceId"       column="instance_id"        />
-        <result property="nodeId"           column="node_id"            />
-        <result property="taskName"         column="task_name"          />
-        <result property="assigneeId"       column="assignee_id"        />
-        <result property="assigneeName"     column="assignee_name"      />
-        <result property="assignTime"       column="assign_time"        />
-        <result property="status"           column="status"             />
-        <result property="completeTime"     column="complete_time"      />
-        <result property="comment"          column="comment"            />
-        <result property="formData"         column="form_data"          />
-        <result property="timeoutTime"      column="timeout_time"       />
-        <result property="isTimeout"        column="is_timeout"         />
-        <result property="createBy"         column="create_by"          />
-        <result property="createTime"       column="create_time"        />
-        <result property="updateBy"         column="update_by"          />
-        <result property="updateTime"       column="update_time"        />
-        <result property="remark"           column="remark"             />
-        <association property="instance"    javaType="ApprovalInstance" resultMap="InstanceResult" />
-        <association property="nodeDefinition" javaType="ApprovalNodeDefinition" resultMap="NodeResult" />
+        <id property="id" column="id"/>
+        <result property="taskNo" column="task_no"/>
+        <result property="instanceId" column="instance_id"/>
+        <result property="nodeId" column="node_id"/>
+        <result property="taskName" column="task_name"/>
+        <result property="assigneeId" column="assignee_id"/>
+        <result property="assigneeName" column="assignee_name"/>
+        <result property="assignTime" column="assign_time"/>
+        <result property="status" column="status"/>
+        <result property="completeTime" column="complete_time"/>
+        <result property="comment" column="comment"/>
+        <result property="formData" column="form_data"/>
+        <result property="timeoutTime" column="timeout_time"/>
+        <result property="isTimeout" column="is_timeout"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <association property="instance" javaType="ApprovalInstance" resultMap="InstanceResult"/>
+        <association property="nodeDefinition" javaType="ApprovalNodeDefinition" resultMap="NodeResult"/>
     </resultMap>
-    
+
     <resultMap id="InstanceResult" type="ApprovalInstance">
-        <id     property="id"               column="instance_id"        />
-        <result property="instanceNo"       column="instance_no"        />
-        <result property="title"            column="instance_title"     />
-        <result property="businessType"     column="business_type"      />
-        <result property="businessId"       column="business_id"        />
-        <result property="submitterId"      column="submitter_id"       />
-        <result property="submitterName"    column="submitter_name"     />
-        <result property="submitTime"       column="submit_time"        />
-        <result property="urgentLevel"      column="urgent_level"       />
+        <id property="id" column="instance_id"/>
+        <result property="instanceNo" column="instance_no"/>
+        <result property="title" column="instance_title"/>
+        <result property="businessType" column="business_type"/>
+        <result property="businessId" column="business_id"/>
+        <result property="submitterId" column="submitter_id"/>
+        <result property="submitterName" column="submitter_name"/>
+        <result property="submitTime" column="submit_time"/>
+        <result property="urgentLevel" column="urgent_level"/>
     </resultMap>
-    
+
     <resultMap id="NodeResult" type="ApprovalNodeDefinition">
-        <id     property="id"               column="node_id"            />
-        <result property="nodeCode"         column="node_code"          />
-        <result property="nodeName"         column="node_name"          />
-        <result property="nodeType"         column="node_type"          />
-        <result property="canReject"        column="can_reject"         />
+        <id property="id" column="node_id"/>
+        <result property="nodeCode" column="node_code"/>
+        <result property="nodeName" column="node_name"/>
+        <result property="nodeType" column="node_type"/>
+        <result property="canReject" column="can_reject"/>
     </resultMap>
 
     <sql id="selectApprovalTaskVo">
-        select id, task_no, instance_id, node_id, task_name, assignee_id, assignee_name, assign_time, 
-               status, complete_time, comment, form_data, timeout_time, is_timeout, create_by, create_time, 
-               update_by, update_time, remark 
+        select id,
+               task_no,
+               instance_id,
+               node_id,
+               task_name,
+               assignee_id,
+               assignee_name,
+               assign_time,
+               status,
+               complete_time,
+               comment,
+               form_data,
+               timeout_time,
+               is_timeout,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
         from approval_task
     </sql>
 
     <select id="selectApprovalTaskList" parameterType="ApprovalTask" resultMap="ApprovalTaskResult">
         <include refid="selectApprovalTaskVo"/>
-        <where>  
-            <if test="taskNo != null  and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
-            <if test="instanceId != null "> and instance_id = #{instanceId}</if>
-            <if test="nodeId != null "> and node_id = #{nodeId}</if>
-            <if test="taskName != null  and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
-            <if test="assigneeId != null "> and assignee_id = #{assigneeId}</if>
-            <if test="assigneeName != null  and assigneeName != ''"> and assignee_name like concat('%', #{assigneeName}, '%')</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="isTimeout != null  and isTimeout != ''"> and is_timeout = #{isTimeout}</if>
+        <where>
+            <if test="taskNo != null  and taskNo != ''">and task_no like concat('%', #{taskNo}, '%')</if>
+            <if test="instanceId != null ">and instance_id = #{instanceId}</if>
+            <if test="nodeId != null ">and node_id = #{nodeId}</if>
+            <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
+            <if test="assigneeId != null ">and assignee_id = #{assigneeId}</if>
+            <if test="assigneeName != null  and assigneeName != ''">and assignee_name like concat('%', #{assigneeName},
+                '%')
+            </if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
+            <if test="isTimeout != null  and isTimeout != ''">and is_timeout = #{isTimeout}</if>
             <if test="params != null and params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 and date_format(assign_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
@@ -75,67 +93,95 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by assign_time desc
     </select>
-    
+
     <select id="selectApprovalTaskById" parameterType="Long" resultMap="ApprovalTaskResult">
         <include refid="selectApprovalTaskVo"/>
         where id = #{id}
     </select>
-    
+
     <select id="selectApprovalTaskByNo" parameterType="String" resultMap="ApprovalTaskResult">
         <include refid="selectApprovalTaskVo"/>
         where task_no = #{taskNo}
     </select>
-    
+
     <select id="selectApprovalTaskByInstanceId" parameterType="Long" resultMap="ApprovalTaskResult">
         <include refid="selectApprovalTaskVo"/>
         where instance_id = #{instanceId}
         order by assign_time
     </select>
-    
+
     <select id="selectApprovalTaskByAssignee" resultMap="ApprovalTaskResult">
-        select 
-            at.id, at.task_no, at.instance_id, at.node_id, at.task_name, at.assignee_id, at.assignee_name, 
-            at.assign_time, at.status, at.complete_time, at.comment, at.form_data, at.timeout_time, at.is_timeout, 
-            at.create_by, at.create_time, at.update_by, at.update_time, at.remark,
-            ai.instance_no, ai.title as instance_title, ai.business_type, ai.business_id, ai.submitter_id, 
-            ai.submitter_name, ai.submit_time, ai.urgent_level,
-            and1.node_code, and1.node_name, and1.node_type, and1.can_reject
+        select
+        at.id, at.task_no, at.instance_id, at.node_id, at.task_name, at.assignee_id, at.assignee_name,
+        at.assign_time, at.status, at.complete_time, at.comment, at.form_data, at.timeout_time, at.is_timeout,
+        at.create_by, at.create_time, at.update_by, at.update_time, at.remark,
+        ai.instance_no, ai.title as instance_title, ai.business_type, ai.business_id, ai.submitter_id,
+        ai.submitter_name, ai.submit_time, ai.urgent_level,
+        and1.node_code, and1.node_name, and1.node_type, and1.can_reject
         from approval_task at
         left join approval_instance ai on at.instance_id = ai.id
         left join approval_node_definition and1 on at.node_id = and1.id
         where at.assignee_id = #{assigneeId}
-        <if test="status != null and status != ''"> and at.status = #{status}</if>
+        <if test="status != null and status != ''">and at.status = #{status}</if>
         order by at.assign_time desc
     </select>
-    
+
     <select id="selectApprovalTaskByInstanceAndNode" resultMap="ApprovalTaskResult">
         <include refid="selectApprovalTaskVo"/>
         where instance_id = #{instanceId} and node_id = #{nodeId}
         limit 1
     </select>
-    
+
     <select id="selectApprovalTaskDetail" parameterType="Long" resultMap="ApprovalTaskResult">
-        select 
-            at.id, at.task_no, at.instance_id, at.node_id, at.task_name, at.assignee_id, at.assignee_name, 
-            at.assign_time, at.status, at.complete_time, at.comment, at.form_data, at.timeout_time, at.is_timeout, 
-            at.create_by, at.create_time, at.update_by, at.update_time, at.remark,
-            ai.instance_no, ai.title as instance_title, ai.business_type, ai.business_id, ai.submitter_id, 
-            ai.submitter_name, ai.submit_time, ai.urgent_level,
-            and1.node_code, and1.node_name, and1.node_type, and1.can_reject
+        select at.id,
+               at.task_no,
+               at.instance_id,
+               at.node_id,
+               at.task_name,
+               at.assignee_id,
+               at.assignee_name,
+               at.assign_time,
+               at.status,
+               at.complete_time,
+               at.comment,
+               at.form_data,
+               at.timeout_time,
+               at.is_timeout,
+               at.create_by,
+               at.create_time,
+               at.update_by,
+               at.update_time,
+               at.remark,
+               ai.instance_no,
+               ai.title as instance_title,
+               ai.business_type,
+               ai.business_id,
+               ai.submitter_id,
+               ai.submitter_name,
+               ai.submit_time,
+               ai.urgent_level,
+               and1.node_code,
+               and1.node_name,
+               and1.node_type,
+               and1.can_reject
         from approval_task at
-        left join approval_instance ai on at.instance_id = ai.id
-        left join approval_node_definition and1 on at.node_id = and1.id
+        left join approval_instance ai
+        on at.instance_id = ai.id
+            left join approval_node_definition and1 on at.node_id = and1.id
         where at.id = #{id}
     </select>
-    
+
     <select id="generateTaskNo" resultType="String">
         SELECT CONCAT('TASK', DATE_FORMAT(NOW(), '%Y%m%d%H%i%s'), LPAD(FLOOR(RAND() * 1000), 3, '0')) AS new_task_no
     </select>
-    
+
     <select id="countPendingTasksByAssignee" parameterType="Long" resultType="int">
-        select count(1) from approval_task where assignee_id = #{assigneeId} and status = 'PENDING'
+        select count(1)
+        from approval_task
+        where assignee_id = #{assigneeId}
+          and status = 'PENDING'
     </select>
-        
+
     <insert id="insertApprovalTask" parameterType="ApprovalTask" useGeneratedKeys="true" keyProperty="id">
         insert into approval_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -157,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
             <if test="instanceId != null">#{instanceId},</if>
@@ -177,7 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateApprovalTask" parameterType="ApprovalTask">
@@ -206,17 +252,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteApprovalTaskById" parameterType="Long">
-        delete from approval_task where id = #{id}
+        delete
+        from approval_task
+        where id = #{id}
     </delete>
 
     <delete id="deleteApprovalTaskByIds" parameterType="String">
-        delete from approval_task where id in 
+        delete from approval_task where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
+
     <delete id="deleteApprovalTaskByInstanceId" parameterType="Long">
-        delete from approval_task where instance_id = #{instanceId}
+        delete
+        from approval_task
+        where instance_id = #{instanceId}
     </delete>
 </mapper>

airport-system/src/main/resources/mapper/approval/ApprovalWorkflowDefinitionMapper.xml

@@ -1,71 +1,89 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sundot.airport.system.mapper.approval.ApprovalWorkflowDefinitionMapper">
-    
+
     <resultMap type="ApprovalWorkflowDefinition" id="ApprovalWorkflowDefinitionResult">
-        <id     property="id"               column="id"                 />
-        <result property="workflowCode"     column="workflow_code"      />
-        <result property="workflowName"     column="workflow_name"      />
-        <result property="workflowType"     column="workflow_type"      />
-        <result property="description"      column="description"        />
-        <result property="status"           column="status"             />
-        <result property="createBy"         column="create_by"          />
-        <result property="createTime"       column="create_time"        />
-        <result property="updateBy"         column="update_by"          />
-        <result property="updateTime"       column="update_time"        />
-        <result property="remark"           column="remark"             />
-        <collection property="nodes"        javaType="java.util.List"   resultMap="NodeResult" />
+        <id property="id" column="id"/>
+        <result property="workflowCode" column="workflow_code"/>
+        <result property="workflowName" column="workflow_name"/>
+        <result property="workflowType" column="workflow_type"/>
+        <result property="description" column="description"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <collection property="nodes" javaType="java.util.List" resultMap="NodeResult"/>
     </resultMap>
-    
+
     <resultMap id="NodeResult" type="ApprovalNodeDefinition">
-        <id     property="id"               column="node_id"            />
-        <result property="workflowId"       column="workflow_id"        />
-        <result property="nodeCode"         column="node_code"          />
-        <result property="nodeName"         column="node_name"          />
-        <result property="nodeType"         column="node_type"          />
-        <result property="sortOrder"        column="sort_order"         />
-        <result property="approverType"     column="approver_type"      />
-        <result property="approverValue"    column="approver_value"     />
-        <result property="canReject"        column="can_reject"         />
-        <result property="isRequired"       column="is_required"        />
-        <result property="timeoutHours"     column="timeout_hours"      />
-        <result property="status"           column="node_status"        />
+        <id property="id" column="node_id"/>
+        <result property="workflowId" column="workflow_id"/>
+        <result property="nodeCode" column="node_code"/>
+        <result property="nodeName" column="node_name"/>
+        <result property="nodeType" column="node_type"/>
+        <result property="sortOrder" column="sort_order"/>
+        <result property="approverType" column="approver_type"/>
+        <result property="approverValue" column="approver_value"/>
+        <result property="canReject" column="can_reject"/>
+        <result property="isRequired" column="is_required"/>
+        <result property="timeoutHours" column="timeout_hours"/>
+        <result property="status" column="node_status"/>
     </resultMap>
 
     <sql id="selectApprovalWorkflowDefinitionVo">
-        select id, workflow_code, workflow_name, workflow_type, description, status, create_by, create_time, update_by, update_time, remark from approval_workflow_definition
+        select id,
+               workflow_code,
+               workflow_name,
+               workflow_type,
+               description,
+               status,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from approval_workflow_definition
     </sql>
 
-    <select id="selectApprovalWorkflowDefinitionList" parameterType="ApprovalWorkflowDefinition" resultMap="ApprovalWorkflowDefinitionResult">
+    <select id="selectApprovalWorkflowDefinitionList" parameterType="ApprovalWorkflowDefinition"
+            resultMap="ApprovalWorkflowDefinitionResult">
         <include refid="selectApprovalWorkflowDefinitionVo"/>
-        <where>  
-            <if test="workflowCode != null  and workflowCode != ''"> and workflow_code like concat('%', #{workflowCode}, '%')</if>
-            <if test="workflowName != null  and workflowName != ''"> and workflow_name like concat('%', #{workflowName}, '%')</if>
-            <if test="workflowType != null  and workflowType != ''"> and workflow_type = #{workflowType}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+        <where>
+            <if test="workflowCode != null  and workflowCode != ''">and workflow_code like concat('%', #{workflowCode},
+                '%')
+            </if>
+            <if test="workflowName != null  and workflowName != ''">and workflow_name like concat('%', #{workflowName},
+                '%')
+            </if>
+            <if test="workflowType != null  and workflowType != ''">and workflow_type = #{workflowType}</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
         </where>
         order by create_time desc
     </select>
-    
+
     <select id="selectApprovalWorkflowDefinitionById" parameterType="Long" resultMap="ApprovalWorkflowDefinitionResult">
         <include refid="selectApprovalWorkflowDefinitionVo"/>
         where id = #{id}
     </select>
-    
-    <select id="selectApprovalWorkflowDefinitionByCode" parameterType="String" resultMap="ApprovalWorkflowDefinitionResult">
+
+    <select id="selectApprovalWorkflowDefinitionByCode" parameterType="String"
+            resultMap="ApprovalWorkflowDefinitionResult">
         <include refid="selectApprovalWorkflowDefinitionVo"/>
         where workflow_code = #{workflowCode} and status = '0'
     </select>
-    
+
     <select id="selectApprovalWorkflowDefinitionByType" parameterType="String" resultType="ApprovalWorkflowDefinition">
         <include refid="selectApprovalWorkflowDefinitionVo"/>
         where workflow_type = #{workflowType} and status = '0'
         order by create_time desc
     </select>
-        
-    <insert id="insertApprovalWorkflowDefinition" parameterType="ApprovalWorkflowDefinition" useGeneratedKeys="true" keyProperty="id">
+
+    <insert id="insertApprovalWorkflowDefinition" parameterType="ApprovalWorkflowDefinition" useGeneratedKeys="true"
+            keyProperty="id">
         insert into approval_workflow_definition
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="workflowCode != null and workflowCode != ''">workflow_code,</if>
@@ -78,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workflowCode != null and workflowCode != ''">#{workflowCode},</if>
             <if test="workflowName != null and workflowName != ''">#{workflowName},</if>
@@ -90,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateApprovalWorkflowDefinition" parameterType="ApprovalWorkflowDefinition">
@@ -111,11 +129,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteApprovalWorkflowDefinitionById" parameterType="Long">
-        delete from approval_workflow_definition where id = #{id}
+        delete
+        from approval_workflow_definition
+        where id = #{id}
     </delete>
 
     <delete id="deleteApprovalWorkflowDefinitionByIds" parameterType="String">
-        delete from approval_workflow_definition where id in 
+        delete from approval_workflow_definition where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>