fix: 接受任务成果优化

linwei

2026-04-16 83b72245f2df2bf78c6b01e1595942ea316e28bf

 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;
@@ -365,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. 设置任务状态：使用枚举设置任务状态
@@ -468,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) {
@@ -731,4 +731,9 @@
      return updateResult;
   }

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

}