From 3bd2a7c41472d2418e427e013ef403fd1cc370d4 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 23 Apr 2026 15:42:11 +0800
Subject: [PATCH] fix: 设置admin 不过滤机构
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 82 ++++++++++++++++++++++++++---------------
1 files changed, 52 insertions(+), 30 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index fdcc12b..46cc64c 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -54,6 +54,7 @@
import org.sxkj.gd.workorder.service.IGdTaskResultService;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.utils.GdPatrolReportWordUtil;
+import org.sxkj.gd.workorder.vo.GdPatrolTaskSimpleVO;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.xingtu.JianXingtuApiService;
import org.sxkj.resource.entity.Attach;
@@ -67,6 +68,7 @@
import java.io.File;
import java.io.IOException;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 巡查任务表 服务实现类
@@ -96,14 +98,13 @@
@Override
public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
List<Long> deptList = new ArrayList<>();
- if (!AuthUtil.isAdministrator()) {
+ if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
}
gdPatrolTask.setDeptList(deptList);
List<GdPatrolTaskVO> gdPatrolTaskVOS = baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask);
return page.setRecords(gdPatrolTaskVOS);
}
-
@Override
public List<GdPatrolTaskExcel> exportGdPatrolTask(Wrapper<GdPatrolTaskEntity> queryWrapper) {
@@ -119,6 +120,8 @@
public boolean savePatrolTask(List<GdPatrolTaskEntity> taskEntityList) {
// 更新流程节点
for (GdPatrolTaskEntity gdPatrolTaskEntity : taskEntityList) {
+ // 设置航线ID
+ gdPatrolTaskEntity.setAirlineId(gdPatrolTaskEntity.getPatrolRouteUrl());
// 生成巡查任务编号
if (StringUtils.isBlank(gdPatrolTaskEntity.getTaskNo())) {
// 使用时间戳生成唯一巡查任务编号
@@ -165,7 +168,7 @@
* @throws RuntimeException 当任务不存在、状态不允许转换或操作失败时抛出
*/
@Override
- // @Transactional(rollbackFor = Exception.class)
+ @Transactional(rollbackFor = Exception.class)
public boolean auditPatrolTask(GdPatrolTaskAuditParam auditParam) {
// 1. 获取巡查任务
GdPatrolTaskEntity task = getById(auditParam.getId());
@@ -230,15 +233,8 @@
.eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));
// 检查是否所有子任务都审核成功（除了被撤回和验收拒绝的）
- boolean allSubTasksAudited = subTasks.stream()
- .map(GdPatrolTaskEntity::getTaskStatus)
- .filter(Objects::nonNull)
- // 过滤掉撤回和验收拒绝的任务
- .filter(status -> !status.equals(PatrolTaskStatusEnum.WITHDRAWN.getValue()) &&
- !status.equals(PatrolTaskStatusEnum.REJECTED_ACCEPTANCE.getValue()))
- // 判断是否有小于待审核的任务
- .anyMatch(status -> status.compareTo(PatrolTaskStatusEnum.PENDING_AUDIT.getValue()) < 0);
- if (allSubTasksAudited) {
+ boolean allSubTasksAudited = isAllSubTasksAudited(subTasks, task, PatrolTaskStatusEnum.PENDING_AUDIT);
+ if (!allSubTasksAudited) {
// 执行工单状态更新逻辑
return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
@@ -271,16 +267,9 @@
.eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));
// 检查是否所有子任务都验收通过（除了被撤回和验收拒绝的）
- boolean allSubTasksAudited = subTasks.stream()
- .map(GdPatrolTaskEntity::getTaskStatus)
- .filter(Objects::nonNull)
- // 过滤掉撤回和验收拒绝的任务
- .filter(status -> !status.equals(PatrolTaskStatusEnum.WITHDRAWN.getValue()) &&
- !status.equals(PatrolTaskStatusEnum.REJECTED_ACCEPTANCE.getValue()))
- // 判断是否有小于待审核的任务
- .anyMatch(status -> status.compareTo(PatrolTaskStatusEnum.PENDING_AUDIT.getValue()) < 0);
+ boolean allSubTasksAudited = isAllSubTasksAudited(subTasks, task, PatrolTaskStatusEnum.ACCEPTANCE_PASSED);
// 这里可以根据allSubTasksAudited的结果执行后续逻辑，比如更新工单状态等
- if (allSubTasksAudited) {
+ if (!allSubTasksAudited) {
// 1.验收通过,生成报告
asyncExportPatrolReport(task.getId());
// 2.执行工单状态更新逻辑
@@ -289,6 +278,35 @@
}
}
return b;
+ }
+
+ /**
+ * @param subTasks
+ * @param task
+ * @param pendingAudit
+ * @return
+ */
+ private static boolean isAllSubTasksAudited(List<GdPatrolTaskEntity> subTasks, GdPatrolTaskEntity task, PatrolTaskStatusEnum pendingAudit) {
+ List<String> validStatusList = subTasks.stream()
+ // 过滤掉当前任务本身
+ .filter(subTask -> !subTask.getId().equals(task.getId()))
+ .map(GdPatrolTaskEntity::getTaskStatus)
+ .filter(Objects::nonNull)
+ // 过滤掉撤回或验收拒绝的任务
+ .filter(status -> !status.equals(PatrolTaskStatusEnum.WITHDRAWN.getValue()) &&
+ !status.equals(PatrolTaskStatusEnum.REJECTED_ACCEPTANCE.getValue()))
+ .collect(Collectors.toList());
+
+ // 如果过滤后没有有效任务，直接返回false
+ if (validStatusList.isEmpty()) {
+ return false;
+ }
+
+ // 判断是否有小于待审核的任务
+ boolean allSubTasksAudited = validStatusList.stream()
+ .anyMatch(status -> status.compareTo(pendingAudit.getValue()) < 0);
+ return allSubTasksAudited;
+
}
@@ -349,13 +367,12 @@
targetStatus = PatrolTaskStatusEnum.PENDING_AUDIT;
break;
default:
- // 其他状态，保持原有状态
- targetStatus = PatrolTaskStatusEnum.getByValue(currentStatus);
- // 如果无法获取枚举，使用待签收作为默认状态
- if (targetStatus == null) {
- targetStatus = PatrolTaskStatusEnum.PENDING_SIGNING;
- }
- break;
+ // 其他状态，保持原有状态
+ targetStatus = PatrolTaskStatusEnum.getByValue(currentStatus);
+ // 如果无法获取枚举，使用待签收作为默认状态
+ if (targetStatus == null) {
+ targetStatus = PatrolTaskStatusEnum.PENDING_SIGNING;
+ }
}
// 3. 设置任务状态：使用枚举设置任务状态
@@ -452,14 +469,14 @@
private boolean saveWorkOrderFlow(Long workOrderId, PatrolTaskStatusEnum newStatus,
String rejectReason, String areaCode) {
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
- flowEntity.setCreateUser(AuthUtil.getUserId());
+ flowEntity.setCreateUser(AuthUtil.getUserId() == null ? 0L : AuthUtil.getUserId());
flowEntity.setWorkOrderId(workOrderId);
flowEntity.setFlowName(newStatus.getStageDesc());
flowEntity.setFlowDesc(newStatus.getStageDesc());
flowEntity.setOperator(AuthUtil.getNickName());
flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
flowEntity.setAreaCode(areaCode);
- flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+ flowEntity.setCreateDept(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
boolean saveResult = gdWorkOrderFlowService.save(flowEntity);
if (!saveResult) {
@@ -715,4 +732,9 @@
return updateResult;
}
+ @Override
+ public List<GdPatrolTaskSimpleVO> selectListByWorkOrderId(Long workOrderId) {
+ return baseMapper.selectListByWorkOrderId(workOrderId);
+ }
+
}
--
Gitblit v1.9.3