From 5e972eb9928c39b5abbdfd35e2a0aeff40876e7d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 07 May 2024 17:23:16 +0800
Subject: [PATCH] 修改不成功问题

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java |   74 +++++++++++++------------------------
 1 files changed, 26 insertions(+), 48 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 cc606e6..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,10 +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.TaskStatusCount;
+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;
@@ -58,12 +56,6 @@
 
 	PatrolTaskVO customizeGetById(@Param("id") String id);
 
-	/**
-	 * 巡查报表，市拿区
-	 * @param patrolTaskReport
-	 * @return
-	 */
-    List<PatrolTaskReport> getCountyReportPage(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
 
 	/**
 	 * 巡查报表，获取水库巡查报表数据
@@ -72,22 +64,6 @@
 	 */
 	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);
 
 	/**
 	 * 巡查报表详情 获取行政区下的水库
@@ -102,35 +78,37 @@
 
 
 	/**
-	 * 巡查报表，市拿区
-	 * @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);
-
 	List<TaskStatusCount> getTaskStatusCount(@Param("vo") PatrolTaskVO patrolTaskVO);
 
 	List<TaskStatusCount> getTaskTypeCount(@Param("vo") PatrolTaskVO patrolTaskVO);
+
+	/**
+	 * 获取省市区统计报表
+	 * @param page
+	 * @param patrolTaskReport
+	 * @return
+	 */
+	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