From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 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 b3a2f46..740d9eb 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,7 @@
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;
@@ -34,22 +35,51 @@
*/
public interface GdPatrolTaskMapper extends BaseMapper<GdPatrolTaskEntity> {
- /**
- * 自定义分页
- *
- * @param page
- * @param gdPatrolTask
- * @return
- */
- List<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList);
+ /**
+ * 自定义分页
+ *
+ * @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);
+ /**
+ *
+ * @param gdPatrolTaskEntity
+ * @return
+ */
+ GdPatrolTaskVO getPatrolTaskDetail(GdPatrolTaskEntity gdPatrolTaskEntity);
+
+ /**
+ *
+ * @param id
+ * @param code
+ * @return
+ */
+ GdWorkOrderEntity getWorkOrderIdById(Long id, String code);
}
--
Gitblit v1.9.3