From 071cd79b24a943ba764448adc07c416bb55ca3ba Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 10:53:18 +0800
Subject: [PATCH] fix(gd): 移除用户部门关联查询中的软删除条件

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java |   80 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 76 insertions(+), 4 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 9a7ab4f..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,11 +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.vo.GdPatrolTaskVO;
-import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+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;
 
 /**
@@ -38,7 +44,7 @@
 	 * @param gdPatrolTask
 	 * @return
 	 */
-	IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskVO gdPatrolTask);
+	IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask);
 
 
 	/**
@@ -49,4 +55,70 @@
 	 */
 	List<GdPatrolTaskExcel> exportGdPatrolTask(Wrapper<GdPatrolTaskEntity> queryWrapper);
 
+	/**
+	 * 批量保存或更新
+	 * @param taskEntityList
+	 * @return
+	 */
+	boolean savePatrolTask(List<GdPatrolTaskEntity> taskEntityList);
+
+	/**
+	 * 审核巡查任务
+	 * @param auditParam
+	 * @return
+	 */
+	boolean auditPatrolTask(GdPatrolTaskAuditParam auditParam);
+
+	/**
+	 * 更新单个巡查任务信息
+	 * @param taskEntity 巡查任务实体
+	 * @return 更新后的任务状态枚举
+	 */
+	boolean republishPatrolTask(GdPatrolTaskEntity taskEntity);
+
+	/**
+	 * 生成巡查报告
+	 *
+	 * @param patrolTaskId 巡查任务主键
+	 * @return 是否上传附件成果成功
+	 */
+	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