巡检模块-审批流程

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

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

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

@@ -380,7 +380,7 @@ public class CheckCorrectionServiceImpl extends ServiceImpl<CheckCorrectionMappe
         } else if (StringUtils.equals(CheckLevelEnum.DEPARTMENT_LEVEL.getCode(), checkCorrection.getCheckedLevel())) {
             Map<String, Object> requestData = new HashMap<>();
             requestData.put("businessId", checkCorrection.getId());//业务ID
-            requestData.put("checkType", "SECURITY_BREACH");//检查类型
+            requestData.put("checkType", CheckLevelEnum.DEPARTMENT_LEVEL.getCode());//检查类型
             requestData.put("severity", "");//严重程度
             requestData.put("location", checkCorrection.getChannelName());//位置
             requestData.put("sectionLeaderId", checkCorrection.getResponsibleUserId());//责任人

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

@@ -9,8 +9,11 @@ import java.util.stream.Collectors;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.system.service.ISysDeptService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.sundot.airport.common.utils.DateUtils;
@@ -23,7 +26,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sundot.airport.system.domain.approval.*;
-import com.sundot.airport.system.domain.approval.constants.ApprovalConstants;
 import com.sundot.airport.system.mapper.approval.*;
 import com.sundot.airport.system.service.approval.IApprovalEngineService;
 import com.sundot.airport.common.core.domain.entity.SysUser;
@@ -68,6 +70,10 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
 
     private ObjectMapper objectMapper = new ObjectMapper();
 
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+
     /**
      * 启动审批流程
      */
@@ -204,7 +210,10 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
         // 5. 查找任务的原始创建者或更新者
         Long originalUserId = approvalUserService.getTaskCreatorOrUpdaterByTaskId(taskId);
 
-        if (originalUserId != null) {
+        if (isSectionCheckWorkflow(instance) && ("DEPARTMENT_LEVEL_LEADER_XINGZHENG".equals(currentNode.getNodeCode()) || "DEPARTMENT_LEVEL_LEADER_JINGLI_ONE".equals(currentNode.getNodeCode()) || "DEPARTMENT_LEVEL_LEADER_JINGLI_TWO".equals(currentNode.getNodeCode()))) {
+            currentNode.setSortOrder(1);
+            moveToNextNode(instance, currentNode, operatorId, operatorName, comment, null, task);
+        } else if (originalUserId != null) {
             // 5.1. 不结束流程，而是创建回流任务给原始操作者
             instance.setStatus("RUNNING"); // 保持运行状态
             instance.setUpdateBy(SecurityUtils.getUsername());
@@ -414,9 +423,9 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
     public ApprovalInstance startSectionLevelProcess(String businessType, Long businessId, String title,
                                                      Long submitterId, String submitterName, Long sectionLeaderId,
                                                      Map<String, Object> formData, Map<String, Object> businessData) {
-        ApprovalWorkflowDefinition workflow = workflowDefinitionMapper.selectApprovalWorkflowDefinitionByCode("SECTION_LEVEL");
+        ApprovalWorkflowDefinition workflow = workflowDefinitionMapper.selectApprovalWorkflowDefinitionByCode("DEPARTMENT_LEVEL");
         if (workflow == null) {
-            throw new RuntimeException("流程定义不存在: SECTION_LEVEL");
+            throw new RuntimeException("流程定义不存在: DEPARTMENT_LEVEL");
         }
 
         ApprovalInstance instance = new ApprovalInstance();
@@ -753,7 +762,11 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
                 }
                 // 科级检查流程的特殊处理
                 else if (isSectionCheckWorkflow(instance)) {
-                    handleSectionCheckNodeAssignment(instance, nextNode, formData);
+                    boolean isNext = handleSectionCheckNodeAssignment(instance, nextNode, formData);
+                    if (isNext) {
+                        currentNode.setSortOrder(nextNode.getSortOrder() + 1);
+                        moveToNextNode(instance, currentNode, operatorId, operatorName, comment, formData, currentTask);
+                    }
                 }
                 // 检查下一节点是否需要动态分配
                 else if (isSeizureReportWorkflow(instance) && "SECTION_KEZHANG".equals(nextNode.getApproverType())) {
@@ -1154,7 +1167,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
      * 检查是否为科级检查流程
      */
     private boolean isSectionCheckWorkflow(ApprovalInstance instance) {
-        return "SECTION_CHECK".equals(instance.getBusinessType());
+        return "DEPARTMENT_CHECK".equals(instance.getBusinessType());
     }
 
     /**
@@ -1182,7 +1195,8 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
     /**
      * 处理科级检查流程的节点分配
      */
-    private void handleSectionCheckNodeAssignment(ApprovalInstance instance, ApprovalNodeDefinition nextNode, Map<String, Object> formData) {
+    private boolean handleSectionCheckNodeAssignment(ApprovalInstance instance, ApprovalNodeDefinition nextNode, Map<String, Object> formData) {
+        boolean isNext = false;
         String nodeCode = nextNode.getNodeCode();
 
         switch (nodeCode) {
@@ -1203,11 +1217,35 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
                 // 责任人审批后 → 发起人审批
                 createTaskForInitiatorFinalReview(instance, nextNode, formData);
                 break;
+            case "DEPARTMENT_LEVEL_LEADER_KEZHANG":
+                // 开始 → 责任人（主管）审批
+                createTaskForResponsiblePerson(instance, nextNode, formData);
+                break;
+            case "DEPARTMENT_LEVEL_LEADER_XINGZHENG":
+                // 责任人（主管）审批 → 发起人（大队行政）审批
+                createTaskForInitiator(instance, nextNode, formData);
+                break;
+            case "DEPARTMENT_LEVEL_LEADER_JINGLI_ONE":
+                // 大队行政审批 → 大队经理1审批
+                createTaskForDept(instance, nextNode, formData);
+                break;
+            case "DEPARTMENT_LEVEL_LEADER_JINGLI_TWO":
+                // 发起人（大队行政）审批 → 大队经理1审批
+                Long deptId = extractTargetDeptIdFromBusinessData(instance.getBusinessData());
+                SysDept sysDept = sysDeptService.selectDeptById(deptId);
+                List<SysUser> sysUserList = sysUserMapper.selectUserByDeptIdAndRoleKeyList(sysDept.getParentId(), Arrays.asList(RoleTypeEnum.jingli.getCode()));
+                if (CollUtil.isNotEmpty(sysUserList) && sysUserList.size() > 1) {
+                    createTaskForDeptTwo(instance, nextNode, formData);
+                } else {
+                    isNext = true;
+                }
+                break;
             default:
                 // 使用默认分配逻辑
                 createTasksForNode(instance, nextNode, formData, null);
                 break;
         }
+        return isNext;
     }
 
     /**
@@ -1772,4 +1810,38 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
             throw new RuntimeException("创建违禁品审批任务失败：" + e.getMessage(), e);
         }
     }
+
+    /**
+     * 为大队经理1创建审批任务
+     */
+    private void createTaskForDept(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData) {
+        try {
+            Long deptId = extractTargetDeptIdFromBusinessData(instance.getBusinessData());
+            SysDept sysDept = sysDeptService.selectDeptById(deptId);
+            List<SysUser> sysUserList = sysUserMapper.selectUserByDeptIdAndRoleKeyList(sysDept.getParentId(), Arrays.asList(RoleTypeEnum.jingli.getCode()));
+            if (CollUtil.isEmpty(sysUserList)) {
+                throw new RuntimeException("未找到部门上级领导，无法分配审批任务");
+            }
+            createSingleApprovalTaskForNode(instance, node, sysUserList.get(0).getUserId(), sysUserList.get(0).getNickName());
+        } catch (Exception e) {
+            logger.error("创建经理1审批任务失败", e);
+        }
+    }
+
+    /**
+     * 为大队经理2创建审批任务
+     */
+    private void createTaskForDeptTwo(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData) {
+        try {
+            Long deptId = extractTargetDeptIdFromBusinessData(instance.getBusinessData());
+            SysDept sysDept = sysDeptService.selectDeptById(deptId);
+            List<SysUser> sysUserList = sysUserMapper.selectUserByDeptIdAndRoleKeyList(sysDept.getParentId(), Arrays.asList(RoleTypeEnum.jingli.getCode()));
+            if (CollUtil.isEmpty(sysUserList) || sysUserList.size() < 2) {
+                throw new RuntimeException("未找到部门上级领导，无法分配审批任务");
+            }
+            createSingleApprovalTaskForNode(instance, node, sysUserList.get(1).getUserId(), sysUserList.get(1).getNickName());
+        } catch (Exception e) {
+            logger.error("创建经理1审批任务失败", e);
+        }
+    }
 }

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

@@ -184,9 +184,9 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         //Long businessId = System.currentTimeMillis();
 
         Map<String, Object> params = new HashMap<>();
-        params.put("businessType", "SECTION_CHECK");
+        params.put("businessType", "DEPARTMENT_CHECK");
         params.put("businessId", businessId);
-        params.put("title", "科级检查");
+        params.put("title", "被检查级别为主管级检查");
         params.put("checkType", checkType);
         params.put("severity", severity);
         params.put("targetDeptId", targetDeptId);
@@ -199,9 +199,7 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         Map<String, Object> businessData = new HashMap<>();
         businessData.put("checkType", checkType);
         businessData.put("severity", severity);
-        if (targetDeptId != null) {
-            businessData.put("targetDeptId", targetDeptId);
-        }
+        businessData.put("targetDeptId", targetDeptId);
         businessData.put("sectionLeaderId", sectionLeaderId);
         params.put("businessData", businessData);
 
@@ -267,7 +265,7 @@ public class CheckApprovalServiceImpl implements ICheckApprovalService {
         Map<String, Object> params = new HashMap<>();
         params.put("businessType", "BRIGADE_CHECK");
         params.put("businessId", businessId);
-        params.put("title", "大队级检查");
+        params.put("title", "被检查级别为大队级检查");
         params.put("checkType", checkType);
         params.put("severity", severity);
         params.put("targetDeptId", targetDeptId);