From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 12 七月 2025 14:42:20 +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 64d2c41..7580118 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 @@ -2,12 +2,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.LocationListTaskQuery; +import com.ruoyi.system.query.PointDetailQuery; 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.TLocationTaskListVO; import com.ruoyi.system.vo.system.TaskListVO; import org.apache.ibatis.annotations.Param; @@ -33,4 +38,12 @@ * @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); + + List<TLocationTaskListVO> pointInspectionHeatDetailTaskList(@Param("query")PointDetailQuery query, @Param("pageInfo")PageInfo<TLocationTaskListVO> pageInfo); + + List<TTask> indexTask(@Param("query") IndexDTO dto); } -- Gitblit v1.7.1