工单优化

linwei

2026-02-04 c84e916b8c020a987119570a3b2b89cce9a1925e

 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;
@@ -64,9 +66,7 @@

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

/**
 * 巡查任务表 服务实现类
@@ -74,14 +74,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
@@ -683,16 +681,47 @@
   }

   @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;
   }

}