Merge branch 'feature/master-check-workflow-20260209' into develop

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckCorrectionController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.collection.CollUtil;
+import com.sundot.airport.common.core.domain.ApprovalWorkflowBatchDto;
 import com.sundot.airport.common.core.domain.DataPermissionResult;
 import com.sundot.airport.web.core.utils.DataPermissionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -172,4 +173,24 @@ public class CheckCorrectionController extends BaseController {
     public AjaxResult rejectTask(@RequestBody CheckCorrection checkCorrection) {
         return success(checkCorrectionService.rejectTask(checkCorrection));
     }
+
+    /**
+     * 批量审批任务（同意）
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:edit')")
+    @Log(title = "批量审批任务（同意）", businessType = BusinessType.UPDATE)
+    @PostMapping("/approveTaskBatch")
+    public AjaxResult approveTaskBatch(@RequestBody ApprovalWorkflowBatchDto approvalWorkflowBatchDto) {
+        return success(checkCorrectionService.approveTaskBatch(approvalWorkflowBatchDto));
+    }
+
+    /**
+     * 批量审批任务（驳回）
+     */
+    @PreAuthorize("@ss.hasPermi('check:checkCorrection:edit')")
+    @Log(title = "批量审批任务（驳回）", businessType = BusinessType.UPDATE)
+    @PostMapping("/rejectTaskBatch")
+    public AjaxResult rejectTaskBatch(@RequestBody ApprovalWorkflowBatchDto approvalWorkflowBatchDto) {
+        return success(checkCorrectionService.rejectTaskBatch(approvalWorkflowBatchDto));
+    }
 }

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckTaskController.java

@@ -2,15 +2,20 @@ package com.sundot.airport.web.controller.check;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.sundot.airport.common.core.domain.DataPermissionResult;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
 import com.sundot.airport.common.enums.CheckLevelEnum;
 import com.sundot.airport.common.enums.CheckTaskStatusEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.common.enums.SourceTypeEnum;
 import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.system.service.ISysDeptService;
 import com.sundot.airport.web.core.utils.DataPermissionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +48,8 @@ import com.sundot.airport.common.core.page.TableDataInfo;
 public class CheckTaskController extends BaseController {
     @Autowired
     private ICheckTaskService checkTaskService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询检查任务列表
@@ -62,15 +69,24 @@ public class CheckTaskController extends BaseController {
                     checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
                     break;
                 case BRIGADE:
-                    checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                    List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+                    List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+                    if (roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                        checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                        checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                    } else {
+                        return getDataTable(Collections.emptyList());
+                    }
                     break;
                 case DEPARTMENT:
                     checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
-                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
                     break;
                 case TEAM:
                     checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
-                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
+                    SysDept teamDept = SecurityUtils.getLoginUser().getUser().getDept();
+                    SysDept departmentDept = sysDeptService.selectDeptById(teamDept.getParentId());
+                    checkTask.setSelfCheckDeptId(departmentDept.getParentId());
                     break;
                 default:
                     return getDataTable(Collections.emptyList());
@@ -83,10 +99,11 @@ public class CheckTaskController extends BaseController {
                     list = checkTaskService.selectCheckTaskList(checkTask);
                     break;
                 case BRIGADE:
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                     list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
                     break;
                 case DEPARTMENT:
-                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
                     list = checkTaskService.selectCheckTaskListWeb(checkTask);
                     break;
                 default:
@@ -113,10 +130,11 @@ public class CheckTaskController extends BaseController {
                 list = checkTaskService.selectCheckTaskList(checkTask);
                 break;
             case BRIGADE:
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
                 break;
             case DEPARTMENT:
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
                 list = checkTaskService.selectCheckTaskListWeb(checkTask);
                 break;
             default:
@@ -188,14 +206,17 @@ public class CheckTaskController extends BaseController {
                 break;
             case BRIGADE:
                 checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 break;
             case DEPARTMENT:
                 checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
                 break;
             case TEAM:
                 checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
+                SysDept teamDept = SecurityUtils.getLoginUser().getUser().getDept();
+                SysDept departmentDept = sysDeptService.selectDeptById(teamDept.getParentId());
+                checkTask.setSelfCheckDeptId(departmentDept.getParentId());
                 break;
             default:
                 return success(0);

airport-check/src/main/java/com/sundot/airport/check/domain/CheckTask.java

@@ -151,9 +151,9 @@ public class CheckTask extends BaseEntity {
     private String ruleTypeDesc;
 
     /**
-     * 是否科内自查(0=否;1=是)
+     * 是否队内自查(0=否;1=是)
      */
-    @Excel(name = "是否科内自查(0=否;1=是)")
+    @Excel(name = "是否队内自查(0=否;1=是)")
     private Integer isSelfCheck;
 
     /**
@@ -175,15 +175,15 @@ public class CheckTask extends BaseEntity {
     private Long updateId;
 
     /**
-     * 自查科室ID
+     * 自查大队ID
      */
-    @Excel(name = "自查科室ID")
+    @Excel(name = "自查大队ID")
     private Long selfCheckDeptId;
 
     /**
-     * 自查科室名称
+     * 自查大队名称
      */
-    @Excel(name = "自查科室名称")
+    @Excel(name = "自查大队名称")
     private String selfCheckDeptName;
 
     /**

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/ICheckCorrectionService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sundot.airport.check.domain.CheckCorrection;
+import com.sundot.airport.common.core.domain.ApprovalWorkflowBatchDto;
 
 /**
  * 问题整改Service接口
@@ -75,4 +76,20 @@ public interface ICheckCorrectionService extends IService<CheckCorrection> {
      * @return 结果
      */
     public int rejectTask(CheckCorrection checkCorrection);
+
+    /**
+     * 批量审批任务（同意）
+     *
+     * @param approvalWorkflowBatchDto 批量审批参数
+     * @return 结果
+     */
+    public int approveTaskBatch(ApprovalWorkflowBatchDto approvalWorkflowBatchDto);
+
+    /**
+     * 批量审批任务（驳回）
+     *
+     * @param approvalWorkflowBatchDto 批量审批参数
+     * @return 结果
+     */
+    public int rejectTaskBatch(ApprovalWorkflowBatchDto approvalWorkflowBatchDto);
 }

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

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sundot.airport.check.domain.CheckProjectItem;
 import com.sundot.airport.check.domain.CheckUser;
+import com.sundot.airport.common.core.domain.ApprovalWorkflowBatchDto;
 import com.sundot.airport.check.service.ICheckProjectItemService;
 import com.sundot.airport.check.service.ICheckUserService;
 import com.sundot.airport.common.constant.Constants;
@@ -29,6 +30,9 @@ import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.common.utils.StringUtils;
 import com.sundot.airport.system.domain.approval.ApprovalInstance;
+import com.sundot.airport.system.domain.approval.ApprovalTask;
+import com.sundot.airport.system.mapper.approval.ApprovalInstanceMapper;
+import com.sundot.airport.system.mapper.approval.ApprovalTaskMapper;
 import com.sundot.airport.system.service.approval.IApprovalEngineService;
 import com.sundot.airport.system.service.approval.ICheckApprovalService;
 import lombok.SneakyThrows;
@@ -63,6 +67,10 @@ public class CheckCorrectionServiceImpl extends ServiceImpl<CheckCorrectionMappe
     private ICheckApprovalService checkApprovalService;
     @Autowired
     private IApprovalEngineService approvalEngineService;
+    @Autowired
+    private ApprovalTaskMapper taskMapper;
+    @Autowired
+    private ApprovalInstanceMapper instanceMapper;
 
     /**
      * 查询问题整改
@@ -380,7 +388,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());//责任人
@@ -407,4 +415,48 @@ public class CheckCorrectionServiceImpl extends ServiceImpl<CheckCorrectionMappe
             throw new ServiceException("被检查级别数据异常");
         }
     }
+
+    /**
+     * 批量审批任务（同意）
+     *
+     * @param approvalWorkflowBatchDto 批量审批参数
+     * @return 结果
+     */
+    @SneakyThrows
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int approveTaskBatch(ApprovalWorkflowBatchDto approvalWorkflowBatchDto) {
+        approvalWorkflowBatchDto.getTaskIdList().forEach(taskId -> {
+            ApprovalTask task = taskMapper.selectApprovalTaskById(taskId);
+            ApprovalInstance instance = instanceMapper.selectApprovalInstanceById(task.getInstanceId());
+            CheckCorrection checkCorrection = selectCheckCorrectionById(instance.getBusinessId());
+            Map<String, Object> formData = BeanUtil.beanToMap(checkCorrection);
+            try {
+                checkApprovalService.approveTask(taskId, approvalWorkflowBatchDto.getComment(), formData, SecurityUtils.getLoginUser().getUserId(), SecurityUtils.getLoginUser().getUsername());
+            } catch (Exception e) {
+                throw new ServiceException("审批失败");
+            }
+        });
+        return 1;
+    }
+
+    /**
+     * 批量审批任务（驳回）
+     *
+     * @param approvalWorkflowBatchDto 批量审批参数
+     * @return 结果
+     */
+    @SneakyThrows
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int rejectTaskBatch(ApprovalWorkflowBatchDto approvalWorkflowBatchDto) {
+        approvalWorkflowBatchDto.getTaskIdList().forEach(taskId -> {
+            try {
+                checkApprovalService.rejectTask(taskId, approvalWorkflowBatchDto.getComment(), SecurityUtils.getLoginUser().getUserId(), SecurityUtils.getLoginUser().getUsername());
+            } catch (Exception e) {
+                throw new ServiceException("审批失败");
+            }
+        });
+        return 1;
+    }
 }

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

@@ -137,7 +137,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setIsSelfCheck(0);
                 dto.setCreateId(null);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(1);
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 dto.setIsSelfCheck(0);
@@ -184,7 +184,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setIsSelfCheck(0);
                 dto.setCreateId(null);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(1);
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 dto.setIsSelfCheck(0);
@@ -231,7 +231,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setIsSelfCheck(0);
                 dto.setCreateId(null);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(1);
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 dto.setIsSelfCheck(0);
@@ -263,13 +263,13 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
                 dto.setIsSelfCheck(0);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
             } else {
                 return Collections.emptyList();
@@ -313,15 +313,15 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setIsSelfCheck(0);
                 resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 resultTemp = checkLargeScreenMapper.problemComparison(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 resultTemp = checkLargeScreenMapper.problemComparisonBanZu(dto);
             } else {
@@ -380,17 +380,17 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
                 deptList = checkLargeScreenMapper.getProblemBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
                 deptList = checkLargeScreenMapper.getProblemBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 resultTemp = checkLargeScreenMapper.problemComparisonTwo(dto);
                 deptList = checkLargeScreenMapper.getProblemDepartment(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBanZu(dto);
                 deptList = checkLargeScreenMapper.getProblemTeam(dto);
@@ -517,13 +517,13 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
                 dto.setIsSelfCheck(0);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
             } else {
                 return null;
@@ -575,15 +575,15 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setIsSelfCheck(0);
                 result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
                 result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
                 result = checkLargeScreenMapper.correctionDistribution(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
                 result = checkLargeScreenMapper.correctionDistributionBanZu(dto);
             } else {
@@ -1004,21 +1004,21 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
                 dto.setIsSelfCheck(null);
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 brigadeId = SecurityUtils.getLoginUser().getDeptId();
                 dto.setCheckedBrigadeId(brigadeId);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 departmentId = SecurityUtils.getLoginUser().getDeptId();
                 dto.setCheckedDepartmentId(departmentId);
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 teamId = SecurityUtils.getLoginUser().getDeptId();
                 dto.setCheckedTeamId(teamId);
             } else if (roleKeyList.contains(RoleTypeEnum.SecurityCheck.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 userId = SecurityUtils.getLoginUser().getUserId();
                 dto.setCheckedUserId(userId);
             } else {

airport-check/src/main/resources/mapper/check/CheckTaskMapper.xml

@@ -304,7 +304,8 @@
                 </otherwise>
             </choose>
             <if test="checkedLevel != null  and checkedLevel != ''">and checked_level = #{checkedLevel}</if>
-            and check_level in ('BRIGADE_LEVEL','DEPARTMENT_LEVEL', 'TEAM_LEVEL')
+            and ((is_self_check = 0 and check_level in ('BRIGADE_LEVEL','DEPARTMENT_LEVEL', 'TEAM_LEVEL'))
+            or (is_self_check = 1 and self_check_dept_id = #{selfCheckDeptId}))
         </where>
         order by create_time desc
     </select>

airport-common/src/main/java/com/sundot/airport/common/core/domain/ApprovalWorkflowBatchDto.java

@@ -0,0 +1,26 @@
+package com.sundot.airport.common.core.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 批量审批参数
+ *
+ * @author ruoyi
+ * @date 2025-09-07
+ */
+@Data
+public class ApprovalWorkflowBatchDto {
+
+    /**
+     * 任务ID列表
+     */
+    private List<Long> taskIdList;
+
+    /**
+     * 审批意见
+     */
+    private String comment;
+
+}

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);