From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java |   42 +++++++++++++++++++++++++++++-------------
 1 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java
index 0b00c02..6a0316a 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java
@@ -17,6 +17,8 @@
 package org.sxkj.gd.workorder.mapper;
 
 import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
+import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
+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.mapper.BaseMapper;
@@ -33,22 +35,36 @@
  */
 public interface GdPatrolTaskMapper extends BaseMapper<GdPatrolTaskEntity> {
 
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param gdPatrolTask
-	 * @return
-	 */
-	List<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage page, GdPatrolTaskVO gdPatrolTask);
+    /**
+     * 自定义分页
+     *
+     * @param page
+     * @param gdPatrolTask
+     * @return
+     */
+    List<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage page, GdPatrolTaskPageParam gdPatrolTask);
 
+
+    /**
+     * 获取导出数据
+     *
+     * @param queryWrapper
+     * @return
+     */
+    List<GdPatrolTaskExcel> exportGdPatrolTask(@Param("ew") Wrapper<GdPatrolTaskEntity> queryWrapper);
+
+    /**
+     * 更新工单状态
+     *
+     * @param workOrderParam 工单实体
+     * @return 更新影响行数
+     */
+    Integer updateWorkOrderById(@Param("workOrderParam") GdWorkOrderEntity workOrderParam);
 
 	/**
-	 * 获取导出数据
-	 *
-	 * @param queryWrapper
+	 * 获取巡查任务详情
+	 * @param patrolTaskId
 	 * @return
 	 */
-	List<GdPatrolTaskExcel> exportGdPatrolTask(@Param("ew") Wrapper<GdPatrolTaskEntity> queryWrapper);
-
+	GdPatrolTaskVO getPatrolTaskIdById(Long patrolTaskId);
 }

--
Gitblit v1.9.3