查获模块-审批流程-主管提交单据则自动审批通过

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

@@ -12,8 +12,10 @@ 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.core.domain.entity.SysRole;
 import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.sundot.airport.common.utils.DateUtils;
@@ -72,6 +74,8 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
 
     @Autowired
     private ISysDeptService sysDeptService;
+    @Autowired
+    private ISysUserService iSysUserService;
 
 
     /**
@@ -114,6 +118,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
         instanceMapper.insertApprovalInstance(instance);
 
         // 3. 获取第一个节点
+        boolean isAutoPass = false;// 是否自动审批通过
         ApprovalNodeDefinition firstNode = nodeDefinitionMapper.selectFirstNodeByWorkflowId(workflow.getId());
         if (firstNode != null) {
             instance.setCurrentNodeId(firstNode.getId());
@@ -124,7 +129,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
                 createTasksForNode(instance, firstNode, formData, null);
             } else {
                 // 开始节点，直接流转到下一个节点
-                moveToNextNode(instance, firstNode, submitterId, submitterName, "提交", formData, null);
+                isAutoPass = moveToNextNode(instance, firstNode, submitterId, submitterName, "提交", formData, null);
             }
         }
 
@@ -133,6 +138,14 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
 
         // 执行业务处理逻辑
         executeBusinessLogic(instance, "APPROVED");
+
+        // 自动审批通过
+        if (isAutoPass) {
+            firstNode.setSortOrder(firstNode.getSortOrder() + 1);
+            moveToNextNode(instance, firstNode, submitterId, submitterName, "自动审批通过", formData, null);
+            recordHistory(instance.getId(), null, null, null, "AUTO_APPROVE", submitterId, submitterName, "自动审批通过", formData);
+            executeBusinessLogic(instance, "APPROVED");
+        }
         return instance;
     }
 
@@ -735,8 +748,8 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
     /**
      * 流转到下一节点
      */
-    private void moveToNextNode(ApprovalInstance instance, ApprovalNodeDefinition currentNode,
-                                Long operatorId, String operatorName, String comment, Map<String, Object> formData, ApprovalTask currentTask) {
+    private boolean 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());
@@ -774,8 +787,17 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
                     if (ObjectUtil.isNotEmpty(currentTask) && ObjectUtil.isNotEmpty(currentTask.getAssigneeId())) {
                         submitterId = currentTask.getAssigneeId();
                     }
-                    // 违禁品审批流程：根据提交人角色分配给其主管
-                    createTasksForNodeWithKeZhang(instance, nextNode, formData, null, submitterId);
+                    SysUser sysUser = iSysUserService.selectUserById(submitterId);
+                    List<String> roleKeyList = sysUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+                    boolean isAutoPass = roleKeyList.contains(RoleTypeEnum.kezhang.getCode());
+                    if (isAutoPass) {
+                        // 违禁品审批流程：根据提交人角色为主管则自动审批通过
+                        createTasksForNodeWithKeZhangAutoPass(instance, nextNode, formData, null, submitterId);
+                        return true;
+                    } else {
+                        // 违禁品审批流程：根据提交人角色分配给其主管
+                        createTasksForNodeWithKeZhang(instance, nextNode, formData, null, submitterId);
+                    }
                 } 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())) {
@@ -805,6 +827,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
             // 没有下一节点，完成流程
             completeProcess(instance, operatorId, operatorName);
         }
+        return false;
     }
 
     /**
@@ -1844,4 +1867,49 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
             logger.error("创建经理1审批任务失败", e);
         }
     }
+
+    /**
+     * 为违禁品审批节点创建任务（根据提交人角色为主管则自动审批通过）
+     */
+    private void createTasksForNodeWithKeZhangAutoPass(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark, Long submitterId) {
+        try {
+            SysUser user = sysUserMapper.selectUserById(submitterId);
+            if (user != null) {
+                ApprovalTask task = new ApprovalTask();
+                task.setTaskNo(taskMapper.generateTaskNo());
+                task.setInstanceId(instance.getId());
+                task.setNodeId(node.getId());
+                task.setTaskName(node.getNodeName());
+                task.setAssigneeId(user.getUserId());
+                task.setAssigneeName(user.getNickName());
+                task.setAssignTime(DateUtils.getNowDate());
+                task.setStatus("APPROVED");
+                task.setCompleteTime(DateUtils.getNowDate());
+
+                // 设置表单数据 - 如果formData为空，使用当前实例的formData
+                try {
+                    if (formData != null) {
+                        task.setFormData(objectMapper.writeValueAsString(formData));
+                    } else {
+                        task.setFormData(instance.getFormData());
+                    }
+                } catch (Exception e) {
+                    // 序列化失败时使用实例的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);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("创建违禁品审批任务失败：" + e.getMessage(), e);
+        }
+    }
 }