查获记录表-审批流程

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

@@ -107,4 +107,20 @@ public interface IApprovalUserService {
      * @return 直接上级的用户ID列表
      */
     List<Long> getDirectSuperiorIds(Long userId);
+
+    /**
+     * 判断用户是否为安检员角色
+     *
+     * @param userId 用户ID
+     * @return 是否为班组长
+     */
+    boolean isSecurityCheck(Long userId);
+
+    /**
+     * 根据用户ID查找其主管（违禁品审批用）
+     *
+     * @param userId 用户ID
+     * @return 主管的用户ID列表
+     */
+    List<Long> getKeZhangByUserId(Long userId);
 }

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

@@ -339,7 +339,9 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
     @Override
     public String getWorkflowCodeByBusinessAndLevel(String businessType, String level, String submitterRole) {
         if ("SEIZURE_REPORT".equals(businessType)) {
-            if ("SEIZURE_REPORT_LEADER".equals(submitterRole)) {
+            if ("SEIZURE_REPORT_DEFAULT".equals(submitterRole)) {
+                return "SEIZURE_REPORT_DEFAULT";
+            } else if ("SEIZURE_REPORT_LEADER".equals(submitterRole)) {
                 return "SEIZURE_REPORT_LEADER";
             } else {
                 return "SEIZURE_REPORT_STAFF";
@@ -353,6 +355,8 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
                 return "SECTION_LEVEL";
             case "GROUP":
                 return "GROUP_LEVEL";
+            case "BRIGADE":
+                return "BRIGADE_LEVEL";
             default:
                 throw new RuntimeException("未知的级别类型：" + level);
         }
@@ -743,7 +747,14 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
                     handleSectionCheckNodeAssignment(instance, nextNode, formData);
                 }
                 // 检查下一节点是否需要动态分配
-                else if (isSeizureReportWorkflow(instance) && ("GROUP_LEADER".equals(nextNode.getApproverType()) || "SECTION_LEADER".equals(nextNode.getApproverType()))) {
+                else if (isSeizureReportWorkflow(instance) && "SECTION_KEZHANG".equals(nextNode.getApproverType())) {
+                    Long submitterId = instance.getSubmitterId();
+                    if (ObjectUtil.isNotEmpty(currentTask) && ObjectUtil.isNotEmpty(currentTask.getAssigneeId())) {
+                        submitterId = currentTask.getAssigneeId();
+                    }
+                    // 违禁品审批流程：根据提交人角色分配给其主管
+                    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())) {
                         submitterId = currentTask.getAssigneeId();
@@ -1701,4 +1712,55 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
         return null;
     }
 
+    /**
+     * 为违禁品审批节点创建任务（根据提交人分配给其主管）
+     */
+    private void createTasksForNodeWithKeZhang(ApprovalInstance instance, ApprovalNodeDefinition node, Map<String, Object> formData, String remark, Long submitterId) {
+        try {
+            // 根据提交人查找其主管
+            List<Long> assigneeIds = approvalUserService.getKeZhangByUserId(submitterId);
+            if (assigneeIds.isEmpty()) {
+                throw new RuntimeException("未找到提交人的主管，无法分配审批任务");
+            }
+
+            for (Long assigneeId : assigneeIds) {
+                SysUser user = sysUserMapper.selectUserById(assigneeId);
+                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(assigneeId);
+                    task.setAssigneeName(user.getNickName());
+                    task.setAssignTime(DateUtils.getNowDate());
+                    task.setStatus("PENDING");
+
+                    // 设置表单数据 - 如果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);
+        }
+    }
 }

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

@@ -1,9 +1,11 @@
 package com.sundot.airport.system.service.approval.impl;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.sundot.airport.common.enums.RoleTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.sundot.airport.common.core.domain.entity.SysUser;
@@ -569,4 +571,38 @@ public class ApprovalUserServiceImpl implements IApprovalUserService {
 
         return superiorIds;
     }
+
+    /**
+     * 判断用户是否为安检员角色
+     */
+    @Override
+    public boolean isSecurityCheck(Long userId) {
+        if (userId == null) {
+            return false;
+        }
+
+        List<Long> groupLeaderIds = getUserIdsByRoleKey("SecurityCheck");
+        return groupLeaderIds.contains(userId);
+    }
+
+    /**
+     * 根据用户ID查找其主管（违禁品审批用）
+     *
+     * @param userId 用户ID
+     * @return 主管的用户ID列表
+     */
+    @Override
+    public List<Long> getKeZhangByUserId(Long userId) {
+        if (userId == null) {
+            return Collections.emptyList();
+        }
+
+        if (!isGroupLeader(userId) && !isSecurityCheck(userId)) {
+            return Collections.emptyList();
+        }
+
+        SysUser user = userMapper.selectUserById(userId);
+        List<SysUser> sysUserList = userMapper.selectUserByDeptIdAndRoleKeyList(user.getDept().getParentId(), Collections.singletonList(RoleTypeEnum.kezhang.getCode()));
+        return sysUserList.stream().map(SysUser::getUserId).distinct().collect(Collectors.toList());
+    }
 }