From 7b9edf1f2f47b196a7876addbab0aca9c8c23c31 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 02 七月 2025 16:15:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TTaskCleanService.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTaskCleanService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTaskCleanService.java
index 4fa1612..b8542f2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTaskCleanService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTaskCleanService.java
@@ -2,9 +2,17 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.applet.query.TaskUserListQuery;
+import com.ruoyi.system.applet.vo.TaskUserListVO;
import com.ruoyi.system.model.TTask;
+import com.ruoyi.system.query.PointDetailQuery;
import com.ruoyi.system.query.TaskListQuery;
+import com.ruoyi.system.query.TaskProgressQuery;
+import com.ruoyi.system.vo.system.ProgressListVO;
+import com.ruoyi.system.vo.system.TLocationTaskListVO;
import com.ruoyi.system.vo.system.TaskListVO;
+
+import java.util.List;
/**
* <p>
@@ -19,4 +27,24 @@
PageInfo<TaskListVO> pageList(TaskListQuery query);
+ PageInfo<TaskUserListVO> pageListUser(TaskUserListQuery query);
+
+ /**
+ * 任务记录导出
+ *
+ * @param query
+ * @return
+ */
+ List<TaskListVO> exportList(TaskListQuery query);
+
+
+ PageInfo<ProgressListVO> taskProgress(TaskProgressQuery query);
+ List<ProgressListVO> taskProgressExport(TaskProgressQuery query);
+
+ /**
+ * 点位巡检热力图-点位详情任务列表
+ * @param query
+ * @return
+ */
+ PageInfo<TLocationTaskListVO> pointInspectionHeatDetailTaskList(PointDetailQuery query);
}
--
Gitblit v1.7.1