From 44c097df8edb062e2438c95cf626f48dcfe7fe83 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 10:46:09 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的任务结果关联问题

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java
index bf470d7..7343e63 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java
@@ -17,15 +17,17 @@
 package org.sxkj.gd.workorder.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
-import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
-import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
-import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
-import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
-import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import java.io.File;
+import org.springblade.core.tool.api.R;
+import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
+import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
+import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
+import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
+import org.sxkj.gd.workorder.param.GdPatrolTaskPendingAcceptanceQueryParam;
+import org.sxkj.gd.workorder.vo.GdPatrolTaskSimpleVO;
+import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
+
 import java.util.List;
 
 /**
@@ -42,7 +44,7 @@
 	 * @param gdPatrolTask
 	 * @return
 	 */
-	IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList);
+	IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask);
 
 
 	/**
@@ -78,8 +80,45 @@
 	 * 生成巡查报告
 	 *
 	 * @param patrolTaskId 巡查任务主键
-	 * @return 报告文件
+	 * @return 是否上传附件成果成功
 	 */
-	File exportPatrolReport(Long patrolTaskId);
+	boolean exportPatrolReport(Long patrolTaskId);
 
+	/**
+	 * 推送巡查任务到星图平台（新增飞行任务）
+	 *
+	 * @param patrolTaskId 巡查任务主键
+	 * @return 接口响应
+	 */
+	R pushXingtuFlyTask(Long patrolTaskId);
+
+	/**
+	 * 获取巡查任务详情
+	 * @param gdPatrolTaskEntity
+	 * @return
+	 */
+    GdPatrolTaskVO getPatrolTaskDetail(GdPatrolTaskEntity gdPatrolTaskEntity);
+
+	/**
+	 *
+	 * @param auditParam
+	 * @return
+	 */
+	boolean updatePatrolTaskById(GdPatrolTaskEntity auditParam);
+
+	/**
+	 * 根据工单ID查询巡查任务列表（仅id和名称）
+	 *
+	 * @param workOrderId 工单ID
+	 * @return 巡查任务列表
+	 */
+	List<GdPatrolTaskSimpleVO> selectListByWorkOrderId(Long workOrderId);
+
+	/**
+	 * 查询待验收状态的巡查任务列表（对外接口）
+	 *
+	 * @param queryParam 查询参数，包含任务名称和时间区间
+	 * @return 待验收状态的巡查任务列表
+	 */
+	List<GdPatrolTaskVO> selectPendingAcceptanceTasks(GdPatrolTaskPendingAcceptanceQueryParam queryParam);
 }

--
Gitblit v1.9.3