From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: Wed, 30 Aug 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java
index 59a98df..3f4669a 100644
--- a/src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java
+++ b/src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java
@@ -16,23 +16,23 @@
@Repository
public interface TaskInfoMapper extends BaseMapper<TaskInfo> {
- List<TaskInfo> selectTaskDataGrid(Map<String, Object> condition, Page<TaskInfo> page);
+ List<TaskInfo> selectTaskDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);
Integer getTotalByYear(Integer year);
- List<TaskInfo> selectTaskDataGridByDep(Map<String, Object> condition, Page<TaskInfo> page);
+ List<TaskInfo> selectTaskDataGridByDep(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);
List<ActiveTaskInfo> selectActiveTaskList(Date time,Byte type);
- List<TaskInfo> selectDataGridViewable(Map<String, Object> condition, Page<TaskInfo> page);
+ List<TaskInfo> selectDataGridViewable(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);
- List<TaskInfo> getWaitReviewDataGrid(Map<String, Object> condition, Page<TaskInfo> page);
+ List<TaskInfo> getWaitReviewDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);
List<TaskVo> getPendingTask(@Param("type")String type, @Param("name") String name);
List<TaskVo> getDoingTask();
- List<WorkShowTaskVo> selectPageWorkTodayDetail(Page<WorkShowTaskVo> page, Map params);
+ List<WorkShowTaskVo> selectPageWorkTodayDetail(@Param("page") Page<WorkShowTaskVo> page,@Param("params") Map params);
int selectCountWorkToday(Byte flag);
@@ -40,7 +40,7 @@
List<Map> selectCountWorkEverydayInMonth(@Param("days")int[] index,@Param("startTime") Date startTime,@Param("status") Byte status);
- List<TaskInfo> selectStatisticsData(Map<String, Object> condition, Page<TaskInfo> page);
+ List<TaskInfo> selectStatisticsData(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);
- List<TaskInfo> selectDataGridTesting(Map<String, Object> condition, Page<TaskInfo> page);
+ List<TaskInfo> selectDataGridTesting(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page);
}
--
Gitblit v1.9.2