From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java
index 32927d2..317a7bc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java
@@ -1,9 +1,8 @@
package cn.gistack.sm.patrol.mapper;
+import cn.gistack.sm.patrol.dto.PatrolTaskDTO;
import cn.gistack.sm.patrol.entity.PatrolTask;
-import cn.gistack.sm.patrol.vo.PatrolTaskReport;
-import cn.gistack.sm.patrol.vo.PatrolTaskStatisticsVO;
-import cn.gistack.sm.patrol.vo.PatrolTaskVO;
+import cn.gistack.sm.patrol.vo.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -57,27 +56,14 @@
PatrolTaskVO customizeGetById(@Param("id") String id);
- /**
- * 巡查报表，市拿区
- * @param patrolTaskReport
- * @return
- */
- List<PatrolTaskReport> getTaskReportRegionPage(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
/**
- * 巡查报表，区拿水库
+ * 巡查报表，获取水库巡查报表数据
* @param patrolTaskReport
* @return
*/
- List<PatrolTaskReport> getTaskReportReservoirPage(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+ List<PatrolTaskReport> getReservoirReportPage(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
- /**
- * 巡查报表，省拿市
- * @param page
- * @param patrolTaskReport
- * @return
- */
- List<PatrolTaskReport> getTaskReportProvincePage(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
/**
* 巡查报表详情 获取行政区下的水库
@@ -87,24 +73,42 @@
*/
List<PatrolTaskReport> getTaskReportDetailRegion(IPage<PatrolTaskReport> page,@Param("patrolTaskReport")PatrolTaskReport patrolTaskReport);
- /**
- * 巡查报表，市拿区
- * @param patrolTaskReport
- * @return
- */
- List<PatrolTaskReport> getTaskReportRegionList(@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+
+
+
/**
- * 巡查报表，区拿水库
+ * 巡查报表，获取水库巡查报表数据
* @param patrolTaskReport
* @return
*/
- List<PatrolTaskReport> getTaskReportReservoirList(@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+ List<PatrolTaskReport> getReservoirReportList(@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+
+ List<TaskStatusCount> getTaskStatusCount(@Param("vo") PatrolTaskVO patrolTaskVO);
+
+ List<TaskStatusCount> getTaskTypeCount(@Param("vo") PatrolTaskVO patrolTaskVO);
/**
- * 巡查报表，省拿市
+ * 获取省市区统计报表
+ * @param page
* @param patrolTaskReport
* @return
*/
- List<PatrolTaskReport> getTaskReportProvinceList(@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+ List<PatrolTaskReport> getRegionReportPage(IPage<PatrolTaskReport> page, @Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+
+ List<PatrolTaskReport> getRegionReportList(@Param("patrolTaskReport")PatrolTaskReport patrolTaskReport);
+
+ TaskStatusCount getTaskStatusCountByType(@Param("vo") PatrolTaskVO patrolTaskVO, @Param("type") String type);
+
+ TaskStatusCount getTaskStatusCountAll(@Param("vo") PatrolTaskVO patrolTaskVO);
+
+ TaskStatus getTaskStatus(@Param("vo") PatrolTaskVO patrolTaskVO);
+
+ List<PatrolTaskVO> selectPatrolTaskPage(@Param("current") long current, @Param("size") long size, @Param("patrolTask") PatrolTaskVO patrolTask);
+
+ long getPatrolTaskTotal(@Param("patrolTask") PatrolTaskVO patrolTask);
+
+ PatrolTaskDTO getTaskDTO(@Param("taskId") String taskId);
+
+ List<PatrolTask> getMyTask(@Param("patrolTask") PatrolTask patrolTask,IPage<PatrolTask> page);
}
--
Gitblit v1.9.3