From caf9d837bc7b2bb6de6b7ba0aac72c3ab7ae93a8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 11:19:31 +0800
Subject: [PATCH] fix(workorder): 修复管理员查询状态列表权限问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java | 73 ++++++++++++++++++++++++++++++------
1 files changed, 61 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 0b00c02..23d0dd3 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,10 @@
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.param.GdPatrolTaskPendingAcceptanceQueryParam;
+import org.sxkj.gd.workorder.vo.GdPatrolTaskSimpleVO;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -33,22 +37,67 @@
*/
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);
+ /**
+ *
+ * @param gdPatrolTaskEntity
+ * @return
+ */
+ GdPatrolTaskVO getPatrolTaskDetail(GdPatrolTaskEntity gdPatrolTaskEntity);
+
+ /**
+ *
+ * @param id
+ * @param code
+ * @return
+ */
+ GdWorkOrderEntity getWorkOrderIdById(Long id, String code);
+
+ /**
+ * 根据工单ID查询巡查任务列表（仅id和名称）
+ *
+ * @param workOrderId 工单ID
+ * @return 巡查任务列表
+ */
+ List<GdPatrolTaskSimpleVO> selectListByWorkOrderId(@Param("workOrderId") Long workOrderId);
+
+ /**
+ * 查询待验收状态的巡查任务列表（对外接口）
+ *
+ * @param queryParam 查询参数，包含任务名称和时间区间
+ * @return 待验收状态的巡查任务列表
+ */
+ List<GdPatrolTaskVO> selectPendingAcceptanceTasks(@Param("queryParam") GdPatrolTaskPendingAcceptanceQueryParam queryParam);
}
--
Gitblit v1.9.3