From 4e0b0be90a8bf14a59f4cfee7959534adea24ba3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 七月 2025 18:45:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTaskMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTaskMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTaskMapper.java
index 7580118..6b33ea3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTaskMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTaskMapper.java
@@ -30,7 +30,7 @@
List<TaskListVO> pageList(@Param("query")TaskListQuery query, @Param("pageInfo")PageInfo<TaskListVO> pageInfo);
- List<TaskUserListVO> pageListUser(@Param("query")TaskUserListQuery query, @Param("pageInfo")PageInfo<TaskUserListVO> pageInfo);
+ List<TaskUserListVO> pageListUser(@Param("query")TaskUserListQuery query);
/**
* 导出任务记录
@@ -46,4 +46,6 @@
List<TLocationTaskListVO> pointInspectionHeatDetailTaskList(@Param("query")PointDetailQuery query, @Param("pageInfo")PageInfo<TLocationTaskListVO> pageInfo);
List<TTask> indexTask(@Param("query") IndexDTO dto);
+
+ List<TTask> getTaskByIds(@Param("ids") List<String> collect1,@Param("lon")String lon,@Param("lat")String lat);
}
--
Gitblit v1.7.1