From 951b06c1aaa8cc4c83f9e4b4ba9fae066fd84941 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 11 七月 2025 21:11:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTaskMapper.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 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 30a3e21..25c5c91 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 @@ -1,7 +1,21 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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.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; + +import java.util.List; /** * <p> @@ -13,4 +27,20 @@ */ public interface TTaskMapper extends BaseMapper<TTask> { + 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); + + List<TLocationTaskListVO> pointInspectionHeatDetailTaskList(@Param("query")PointDetailQuery query, @Param("pageInfo")PageInfo<TLocationTaskListVO> pageInfo); } -- Gitblit v1.7.1