From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java |   82 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 insertions(+), 0 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 66356b6..a37bd74 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,6 +1,7 @@
 package cn.gistack.sm.patrol.mapper;
 
 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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -18,6 +19,13 @@
 	 * @return
 	 */
 	List<PatrolTaskVO> selectPatrolTask(IPage<PatrolTaskVO> page,@Param("patrolTask") PatrolTaskVO patrolTask);
+
+	/**
+	 * 获取全部
+	 * @param patrolTaskVO
+	 * @return
+	 */
+	List<PatrolTask> getAll(@Param("patrolTask") PatrolTaskVO patrolTaskVO);
 
 	/**
 	 * 查询巡查人员统计数据信息
@@ -46,4 +54,78 @@
 	 * @return
 	 */
 	PatrolTask getPatrolTaskById(@Param("id")String id);
+
+	PatrolTaskVO customizeGetById(@Param("id") String id);
+
+	/**
+	 * 巡查报表，市拿区
+	 * @param patrolTaskReport
+	 * @return
+	 */
+    List<PatrolTaskReport> getCountyReportPage(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+
+	/**
+	 * 巡查报表，获取水库巡查报表数据
+	 * @param patrolTaskReport
+	 * @return
+	 */
+	List<PatrolTaskReport> getReservoirReportPage(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+
+	/**
+	 * 巡查报表，获取市级巡查报表数据
+	 * @param page
+	 * @param patrolTaskReport
+	 * @return
+	 */
+    List<PatrolTaskReport> getCityReportPage(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+
+
+	/**
+	 * 巡查报表，获取乡镇巡查数据
+	 * @param page
+	 * @param patrolTaskReport
+	 * @return
+	 */
+	List<PatrolTaskReport> getTownReportPage(IPage<PatrolTaskReport> page, @Param("patrolTaskReport")PatrolTaskReport patrolTaskReport);
+
+	/**
+	 * 巡查报表详情 获取行政区下的水库
+	 * @param page
+	 * @param patrolTaskReport
+	 * @return
+	 */
+	List<PatrolTaskReport> getTaskReportDetailRegion(IPage<PatrolTaskReport> page,@Param("patrolTaskReport")PatrolTaskReport patrolTaskReport);
+
+
+
+
+
+	/**
+	 * 巡查报表，市拿区
+	 * @param patrolTaskReport
+	 * @return
+	 */
+	List<PatrolTaskReport> getCountyReportList(@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+
+	/**
+	 * 巡查报表，获取水库巡查报表数据
+	 * @param patrolTaskReport
+	 * @return
+	 */
+	List<PatrolTaskReport> getReservoirReportList(@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+
+	/**
+	 * 巡查报表，获取市级巡查报表数据
+	 * @param patrolTaskReport
+	 * @return
+	 */
+	List<PatrolTaskReport> getCityReportList(@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+
+
+	/**
+	 * 巡查报表，获取乡镇巡查数据
+	 * @param patrolTaskReport
+	 * @return
+	 */
+	List<PatrolTaskReport> getTownReportList( @Param("patrolTaskReport")PatrolTaskReport patrolTaskReport);
 }

--
Gitblit v1.9.3