jagzwxm/ja_manage.git

			@@ -241,16 +241,16 @@
			}
			}
			if (auditStatus == 3) {
			// 查询同一个工单下的所有子任务
			// 撤回任务操作：查询同一个工单下的所有子任务
			List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
			.eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

			// 检查是否所有子任务都已撤回
			boolean allSubTasksWithdrawn = subTasks.stream()
			.allMatch(item -> item.getTaskStatus().equals(PatrolTaskStatusEnum.WITHDRAWN.getValue()));

			// 示例：如果所有子任务都审核成功，可以更新工单状态为已完成
			// 如果所有子任务都已撤回，则将工单状态更新为"接单响应_已取消"
			if (allSubTasksWithdrawn) {
			// 执行工单状态更新逻辑
			return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
			WorkOrderStatusEnum.RESPONDING_CANCELED);
			}
			@@ -663,7 +663,7 @@
			param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
			}
			if ((gdPatrolTaskVO.getId() != null)) {
			param.setPatrolTaskld(String.valueOf(gdPatrolTaskVO.getId()));
			param.setPatrolTaskId(String.valueOf(gdPatrolTaskVO.getId()));
			}
			param.setTimingType("单次执行");
			if (StringUtil.isNotBlank(gdPatrolTaskVO.getAirlineId())) {

	drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuFlyTaskSaveDTO.java	2 ●●●●● patch \| view \| raw \| blame \| history
	drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java	8 ●●●●● patch \| view \| raw \| blame \| history

			@@ -34,7 +34,7 @@
			private String name;

			@ApiModelProperty("巡查任务Id")
			private String patrolTaskld ;
			private String patrolTaskId;

			@ApiModelProperty("机场id")
			private String airportId;