From 61f9d261edb521fc9d0f23c5f0a116dcd90c6b23 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 01 七月 2025 14:46:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTaskMapper.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 e81793d..de160e6 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
@@ -7,7 +7,9 @@
import com.ruoyi.system.model.TTask;
import com.ruoyi.system.query.LocationListTaskQuery;
import com.ruoyi.system.query.TaskListQuery;
+import com.ruoyi.system.query.TaskProgressQuery;
import com.ruoyi.system.vo.system.LocationListTaskVO;
+import com.ruoyi.system.vo.system.ProgressListVO;
import com.ruoyi.system.vo.system.TaskListVO;
import org.apache.ibatis.annotations.Param;
@@ -26,4 +28,15 @@
List<TaskListVO> pageList(@Param("query")TaskListQuery query, @Param("pageInfo")PageInfo<TaskListVO> pageInfo);
List<TaskUserListVO> pageListUser(@Param("query")TaskUserListQuery query, @Param("pageInfo")PageInfo<TaskUserListVO> pageInfo);
+
+ /**
+ * 导出任务记录
+ * @param query
+ * @return
+ */
+ List<TaskListVO> exportList(@Param("query")TaskListQuery query);
+
+ List<ProgressListVO> taskProgress(@Param("query")TaskProgressQuery query, @Param("pageInfo")PageInfo<ProgressListVO> pageInfo);
+
+ List<ProgressListVO> taskProgressExport(@Param("query")TaskProgressQuery query);
}
--
Gitblit v1.7.1