巡检模块-审批流程

airport-check/src/main/java/com/sundot/airport/check/handler/CheckCorrectionApprovalHandler.java

@@ -43,7 +43,8 @@ public class CheckCorrectionApprovalHandler implements BusinessApprovalHandler {
     public boolean supports(String businessType) {
         return "PERSONAL_CHECK".equals(businessType)
                 || "GROUP_CHECK".equals(businessType)
-                || "SECTION_CHECK".equals(businessType);
+                || "SECTION_CHECK".equals(businessType)
+                || "BRIGADE_CHECK".equals(businessType);
     }
 
     @Override

airport-check/src/main/java/com/sundot/airport/check/service/impl/CheckCorrectionServiceImpl.java

@@ -390,6 +390,19 @@ public class CheckCorrectionServiceImpl extends ServiceImpl<CheckCorrectionMappe
             checkCorrection.setInstanceId(approvalInstance.getId());
             checkCorrectionMapper.updateCheckCorrection(checkCorrection);
             log.info("科级:{}", approvalInstance);
+        } else if (StringUtils.equals(CheckLevelEnum.BRIGADE_LEVEL.getCode(), checkCorrection.getCheckedLevel())) {
+            Map<String, Object> requestData = new HashMap<>();
+            requestData.put("businessId", checkCorrection.getId());//业务ID
+            requestData.put("checkType", CheckLevelEnum.BRIGADE_LEVEL.getCode());//检查类型
+            requestData.put("severity", "");//严重程度
+            requestData.put("location", checkCorrection.getChannelName());//位置
+            requestData.put("sectionLeaderId", checkCorrection.getResponsibleUserId());//责任人
+            requestData.put("targetDeptId", checkCorrection.getCheckedDeptId());//目标部门ID
+            requestData.put("formData", BeanUtil.beanToMap(checkCorrection));
+            ApprovalInstance approvalInstance = checkApprovalService.submitBrigadeCheck(requestData, SecurityUtils.getLoginUser().getUserId(), SecurityUtils.getLoginUser().getUsername(), CheckLevelEnum.DEPARTMENT_LEVEL.getDesc());
+            checkCorrection.setInstanceId(approvalInstance.getId());
+            checkCorrectionMapper.updateCheckCorrection(checkCorrection);
+            log.info("大队级:{}", approvalInstance);
         } else {
             throw new ServiceException("被检查级别数据异常");
         }

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

@@ -134,6 +134,23 @@ public interface IApprovalEngineService {
                                               Map<String, Object> formData, Map<String, Object> businessData);
 
     /**
+     * 大队级审批流程
+     *
+     * @param businessType    业务类型
+     * @param businessId      业务ID
+     * @param title           标题
+     * @param submitterId     提交人ID
+     * @param submitterName   提交人姓名
+     * @param sectionLeaderId 责任人ID（大队行政人员）
+     * @param formData        表单数据
+     * @param businessData    业务数据
+     * @return 审批实例
+     */
+    ApprovalInstance startBrigadeLevelProcess(String businessType, Long businessId, String title,
+                                              Long submitterId, String submitterName, Long sectionLeaderId,
+                                              Map<String, Object> formData, Map<String, Object> businessData);
+
+    /**
      * 班组级审批流程
      *
      * @param businessType  业务类型

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

@@ -38,6 +38,18 @@ public interface ICheckApprovalService {
     ApprovalInstance submitSectionCheck(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      备注
+     * @return ApprovalInstance 审批实例
+     * @throws Exception 启动流程失败时抛出异常
+     */
+    ApprovalInstance submitBrigadeCheck(Map<String, Object> requestData, Long userId, String username, String remark) throws Exception;
+
+    /**
      * 启动班组级检查审批流程
      *
      * @param requestData 请求数据，包含checkType、severity、groupLeaderId、formData等

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

@@ -1,5 +1,6 @@
 package com.sundot.airport.system.service.approval.impl;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -9,6 +10,7 @@ import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.sundot.airport.common.enums.RoleTypeEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.sundot.airport.common.utils.DateUtils;
@@ -458,6 +460,65 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
     }
 
     /**
+     * 大队级审批流程
+     */
+    @Override
+    @Transactional
+    public ApprovalInstance startBrigadeLevelProcess(String businessType, Long businessId, String title,
+                                                     Long submitterId, String submitterName, Long sectionLeaderId,
+                                                     Map<String, Object> formData, Map<String, Object> businessData) {
+        ApprovalWorkflowDefinition workflow = workflowDefinitionMapper.selectApprovalWorkflowDefinitionByCode("BRIGADE_LEVEL");
+        if (workflow == null) {
+            throw new RuntimeException("流程定义不存在: SECTION_LEVEL");
+        }
+
+        ApprovalInstance instance = new ApprovalInstance();
+        instance.setInstanceNo(instanceMapper.generateInstanceNo());
+        instance.setWorkflowId(workflow.getId());
+        instance.setTitle(title);
+        instance.setBusinessType(businessType);
+        instance.setBusinessId(businessId);
+        instance.setSubmitterId(submitterId);
+        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);
+        }
+
+        try {
+            instance.setBusinessData(objectMapper.writeValueAsString(businessData));
+        } catch (Exception e) {
+            throw new RuntimeException("业务数据序列化失败", e);
+        }
+
+        instance.setCreateBy(SecurityUtils.getUsername());
+        instance.setCreateTime(DateUtils.getNowDate());
+
+        instanceMapper.insertApprovalInstance(instance);
+
+        // 获取第一个节点
+        ApprovalNodeDefinition firstNode = nodeDefinitionMapper.selectFirstNodeByWorkflowId(workflow.getId());
+        if (firstNode != null) {
+            instance.setCurrentNodeId(firstNode.getId());
+            instanceMapper.updateApprovalInstance(instance);
+
+            // 如果是开始节点，直接流转到下一个节点（科长审批）
+            if ("START".equals(firstNode.getNodeType())) {
+                moveToNextNode(instance, firstNode, submitterId, submitterName, "提交", formData, null);
+            }
+        }
+
+        // 记录提交历史
+        recordHistory(instance.getId(), null, null, null, "SUBMIT", submitterId, submitterName, "提交大队级审批流程", formData);
+
+        return instance;
+    }
+
+    /**
      * 班组级审批流程
      */
     @Override
@@ -669,8 +730,12 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
                 // 结束节点，完成流程
                 completeProcess(instance, operatorId, operatorName);
             } else {
+                // 大队级别检查流程的特殊处理
+                if (isBrigadeCheckWorkflow(instance)) {
+                    handleBrigadeCheckNodeAssignment(instance, nextNode, formData);
+                }
                 // 个人级别检查流程的特殊处理
-                if (isPersonalCheckWorkflow(instance)) {
+                else if (isPersonalCheckWorkflow(instance)) {
                     handlePersonalCheckNodeAssignment(instance, nextNode, formData);
                 }
                 // 科级检查流程的特殊处理
@@ -727,7 +792,6 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
         if (!"SEIZURE_REPORT".equals(instance.getBusinessType())) {
             createCcRecords(instance);
         }
-        ;
 
         // 执行业务处理逻辑
         executeBusinessLogic(instance, "APPROVED");
@@ -1331,7 +1395,9 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
             java.util.Set<Long> ccUserIds = new java.util.HashSet<>();
 
             // 根据业务类型决定抄送对象
-            if ("PERSONAL_CHECK".equals(instance.getBusinessType())) {
+            if ("BRIGADE_CHECK".equals(instance.getBusinessType())) {
+                createBrigadeCheckCcRecords(instance, ccUserIds);
+            } else if ("PERSONAL_CHECK".equals(instance.getBusinessType())) {
                 // 个人级别检查：抄送质检科、组长发起人、审批科长
                 createPersonalCheckCcRecords(instance, ccUserIds);
             } else {
@@ -1578,4 +1644,61 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
         }
     }
 
+    /**
+     * 检查是否为大队级别检查流程
+     */
+    private boolean isBrigadeCheckWorkflow(ApprovalInstance instance) {
+        return "BRIGADE_CHECK".equals(instance.getBusinessType());
+    }
+
+    /**
+     * 处理科级检查流程的节点分配
+     */
+    private void handleBrigadeCheckNodeAssignment(ApprovalInstance instance, ApprovalNodeDefinition nextNode, Map<String, Object> formData) {
+        String nodeCode = nextNode.getNodeCode();
+        switch (nodeCode) {
+            case "RESPONSIBLE_PERSON_REVIEW":
+                // 质检科 → 责任人（大队行政人员）整改审批
+                createTaskForResponsiblePerson(instance, nextNode, formData);
+                break;
+            case "INITIATOR_FINAL_REVIEW":
+                // 责任人（大队行政人员） → 发起人审批
+                createTaskForInitiatorFinalReview(instance, nextNode, formData);
+                break;
+            default:
+                // 使用默认分配逻辑
+                createTasksForNode(instance, nextNode, formData, null);
+                break;
+        }
+    }
+
+    /**
+     * 为大队级别检查创建抄送记录
+     */
+    private void createBrigadeCheckCcRecords(ApprovalInstance instance, java.util.Set<Long> ccUserIds) {
+        Long deptId = extractTargetDeptIdFromBusinessData(instance.getBusinessData());
+        List<SysUser> sysUserList = sysUserMapper.selectUserByDeptIdAndRoleKeyList(deptId, Arrays.asList(RoleTypeEnum.jingli.getCode()));
+        for (SysUser user : sysUserList) {
+            ccUserIds.add(user.getUserId());
+        }
+    }
+
+    /**
+     * 从业务数据中提取目标部门
+     */
+    private Long extractTargetDeptIdFromBusinessData(String businessData) {
+        try {
+            if (businessData.contains("\"targetDeptId\"")) {
+                java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("\"targetDeptId\"\\s*:\\s*(\\d+)");
+                java.util.regex.Matcher matcher = pattern.matcher(businessData);
+                if (matcher.find()) {
+                    return Long.valueOf(matcher.group(1));
+                }
+            }
+        } catch (Exception e) {
+            logger.warn("解析targetDeptId失败", e);
+        }
+        return null;
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.sundot.airport.system.service.approval.impl;
 
+import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.system.domain.approval.ApprovalInstance;
 import com.sundot.airport.system.domain.approval.ApprovalTask;
 import com.sundot.airport.system.domain.approval.ApprovalCc;
@@ -217,6 +218,87 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
     }
 
     @Override
+    public ApprovalInstance submitBrigadeCheck(Map<String, Object> requestData, Long userId, String username, String remark) throws Exception {
+        // 提取系统控制参数
+        String checkType = (String) requestData.get("checkType");
+        String severity = (String) requestData.get("severity");
+        Object targetDeptIdObj = requestData.get("targetDeptId");
+        Object sectionLeaderIdObj = requestData.get("sectionLeaderId");
+        Object businessIdObj = requestData.get("businessId");
+        Map<String, Object> userFormData = (Map<String, Object>) requestData.get("formData");
+
+        if (businessIdObj == null) {
+            throw new ServiceException("businessId参数不能为空");
+        }
+
+        if (targetDeptIdObj == null) {
+            throw new ServiceException("targetDeptId参数不能为空");
+        }
+
+        if (sectionLeaderIdObj == null) {
+            throw new ServiceException("sectionLeaderId参数不能为空");
+        }
+
+        if (userFormData == null) {
+            throw new ServiceException("formData参数不能为空");
+        }
+
+        Long businessId = null;
+        if (businessIdObj instanceof Number) {
+            businessId = ((Number) businessIdObj).longValue();
+        } else if (businessIdObj instanceof String) {
+            businessId = Long.parseLong((String) businessIdObj);
+        }
+
+        Long targetDeptId = null;
+        if (targetDeptIdObj instanceof Number) {
+            targetDeptId = ((Number) targetDeptIdObj).longValue();
+        } else if (targetDeptIdObj instanceof String) {
+            targetDeptId = Long.parseLong((String) targetDeptIdObj);
+        }
+
+        Long sectionLeaderId = null;
+        if (sectionLeaderIdObj instanceof Number) {
+            sectionLeaderId = ((Number) sectionLeaderIdObj).longValue();
+        } else if (sectionLeaderIdObj instanceof String) {
+            sectionLeaderId = Long.parseLong((String) sectionLeaderIdObj);
+        }
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("businessType", "BRIGADE_CHECK");
+        params.put("businessId", businessId);
+        params.put("title", "大队级检查");
+        params.put("checkType", checkType);
+        params.put("severity", severity);
+        params.put("targetDeptId", targetDeptId);
+        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);
+        businessData.put("severity", severity);
+        businessData.put("targetDeptId", targetDeptId);
+        businessData.put("sectionLeaderId", sectionLeaderId);
+        businessData.put("initiatorId", userId);
+        params.put("businessData", businessData);
+
+        return approvalEngineService.startBrigadeLevelProcess(
+                (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 {
         // 提取系统控制参数
         String checkType = (String) requestData.get("checkType");