fix: 接受任务成果优化

linwei

2026-04-16 83b72245f2df2bf78c6b01e1595942ea316e28bf

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.oss.model.BladeFile;
@@ -32,6 +33,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.utils.OrderNumUtils;
import org.sxkj.gd.common.GdMultipartFileUtil;
@@ -52,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;
@@ -64,9 +67,8 @@

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 巡查任务表 服务实现类
@@ -74,14 +76,12 @@
 * @author lw
 * @since 2026-01-14
 */
@Slf4j
@Service
public class GdPatrolTaskServiceImpl extends BaseServiceImpl<GdPatrolTaskMapper, GdPatrolTaskEntity> implements IGdPatrolTaskService {

   @Autowired
   private IGdWorkOrderFlowService gdWorkOrderFlowService;

   // @Autowired
   // private IGdWorkOrderService gdWorkOrderService;
   @Autowired
   private ISysClient sysClient;
   @Autowired
@@ -232,9 +232,8 @@
            .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

         // 检查是否所有子任务都审核成功（除了被撤回和验收拒绝的）
         boolean allSubTasksAudited = checkAllSubTasksStatus(subTasks, PatrolTaskStatusEnum.AUDIT_PASSED);
         // 示例：如果所有子任务都审核成功，可以更新工单状态为已完成
         if (allSubTasksAudited) {
         boolean allSubTasksAudited = isAllSubTasksAudited(subTasks, task, PatrolTaskStatusEnum.PENDING_AUDIT);
         if (!allSubTasksAudited) {
            // 执行工单状态更新逻辑
            return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
               WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
@@ -267,9 +266,9 @@
            .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

         // 检查是否所有子任务都验收通过（除了被撤回和验收拒绝的）
         boolean allSubTasksAudited = checkAllSubTasksStatus(subTasks, PatrolTaskStatusEnum.ACCEPTANCE_PASSED);
         boolean allSubTasksAudited = isAllSubTasksAudited(subTasks, task, PatrolTaskStatusEnum.ACCEPTANCE_PASSED);
         // 这里可以根据allSubTasksAudited的结果执行后续逻辑，比如更新工单状态等
         if (allSubTasksAudited) {
         if (!allSubTasksAudited) {
            // 1.验收通过,生成报告
            asyncExportPatrolReport(task.getId());
            // 2.执行工单状态更新逻辑
@@ -280,28 +279,35 @@
      return b;
   }


   /**
    * 检查是否所有子任务都达到指定状态（除了被撤回和验收拒绝的）
    *
    * @param subTasks     子任务列表
    * @param targetStatus 目标状态枚举
    * @return 是否所有子任务都达到指定状态
    * @param subTasks
    * @param task
    * @param pendingAudit
    * @return
    */
   private boolean checkAllSubTasksStatus(List<GdPatrolTaskEntity> subTasks, PatrolTaskStatusEnum targetStatus) {
      for (GdPatrolTaskEntity subTask : subTasks) {
         String taskStatus = subTask.getTaskStatus();
         PatrolTaskStatusEnum statusEnum = PatrolTaskStatusEnum.getByValue(taskStatus);
   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 (statusEnum != targetStatus &&
            statusEnum != PatrolTaskStatusEnum.WITHDRAWN &&
            statusEnum != PatrolTaskStatusEnum.REJECTED_ACCEPTANCE) {
            return false;
         }
      // 如果过滤后没有有效任务，直接返回false
      if (validStatusList.isEmpty()) {
         return false;
      }
      return true;

      // 判断是否有小于待审核的任务
      boolean allSubTasksAudited = validStatusList.stream()
         .anyMatch(status -> status.compareTo(pendingAudit.getValue()) < 0);
      return allSubTasksAudited;

   }


   /**
    * 更新工单状态并保存流转记录
@@ -360,13 +366,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. 设置任务状态：使用枚举设置任务状态
@@ -463,14 +468,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) {
@@ -683,16 +688,52 @@
   }

   @Override
   @Transactional(rollbackFor = Exception.class) // 添加事务注解，确保数据一致性
   public boolean updatePatrolTaskById(GdPatrolTaskEntity auditParam) {
      GdPatrolTaskEntity patrolTaskEntity = getById(auditParam.getId());
      // 保存巡查工单流转
      saveWorkOrderFlow(patrolTaskEntity.getWorkOrderId(), PatrolTaskStatusEnum.PENDING_ACCEPTANCE, null, null);
      // 保存工单流转
      GdWorkOrderEntity workOrderEntity = baseMapper.getWorkOrderIdById(auditParam.getId(), WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getCode());
      // 工单流转
      if (workOrderEntity == null) {
         updateWorkOrderStatusAndFlow(patrolTaskEntity.getWorkOrderId(), WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
      // 1. 更新当前任务状态
      boolean updateResult = updateById(auditParam);
      if (!updateResult) {
         log.warn("更新任务失败，任务ID: {}");
         return false;
      }
      return updateById(auditParam);

      // 2. 获取当前任务实体（优先使用 auditParam 中的数据，避免重复查询）
      GdPatrolTaskEntity patrolTaskEntity = Optional.ofNullable(getById(auditParam.getId()))
         .orElseThrow(() -> new RuntimeException("任务不存在，任务ID: " + auditParam.getId()));

      // 3. 保存巡查工单流转
      saveWorkOrderFlow(patrolTaskEntity.getWorkOrderId(), PatrolTaskStatusEnum.PENDING_ACCEPTANCE, null, null);

      // 4. 查询同一个工单下的所有子任务
      List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
         .eq(GdPatrolTaskEntity::getWorkOrderId, patrolTaskEntity.getWorkOrderId()));

      // 5. 判空处理，防止 NullPointerException
      if (CollectionUtils.isEmpty(subTasks)) {
         log.info("工单ID {} 下无子任务", patrolTaskEntity.getWorkOrderId());
         return true;
      }

      // 6. 判断是否有小于待验收的工单（统一使用枚举值比较）
      boolean hasLessThanPendingAcceptance = subTasks.stream()
         .map(GdPatrolTaskEntity::getTaskStatus)
         .filter(Objects::nonNull)
         .anyMatch(status -> status.compareTo(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue()) < 0);

      // 7. 根据判断结果决定是否更新工单状态
      if (!hasLessThanPendingAcceptance) {
         updateWorkOrderStatusAndFlow(patrolTaskEntity.getWorkOrderId(), WorkOrderStatusEnum.COMPLETED_TO_BE_INSPECTED);
         log.info("工单ID {} 下所有子任务均已达到待验收状态，更新工单状态为完成待验", patrolTaskEntity.getWorkOrderId());
      } else {
         log.warn("工单ID {} 下存在未达待验收状态的子任务", patrolTaskEntity.getWorkOrderId());
      }

      return updateResult;
   }

   @Override
   public List<GdPatrolTaskSimpleVO> selectListByWorkOrderId(Long workOrderId) {
      return baseMapper.selectListByWorkOrderId(workOrderId);
   }

}