From 1dfb91db022f6cfa4bcb9d953ca9aa8a503e1ca5 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期六, 12 七月 2025 11:47:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/service/TTaskCleanService.java | 13 +++++++++++++ 1 files changed, 13 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 167a9fc..b47279d 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,12 +2,15 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.system.applet.dto.IndexDTO; 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; @@ -37,5 +40,15 @@ PageInfo<ProgressListVO> taskProgress(TaskProgressQuery query); + List<ProgressListVO> taskProgressExport(TaskProgressQuery query); + + /** + * 点位巡检热力图-点位详情任务列表 + * @param query + * @return + */ + PageInfo<TLocationTaskListVO> pointInspectionHeatDetailTaskList(PointDetailQuery query); + + List<TTask> indexTask(IndexDTO dto); } -- Gitblit v1.7.1