From 916b76ee90fceff31fe7969db9d9da995d919d52 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 28 Jul 2023 17:05:26 +0800
Subject: [PATCH] 巡查报表接口修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 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 5866db7..87fbb0d 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
@@ -4,6 +4,7 @@
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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -55,29 +56,16 @@
*/
PatrolTask getPatrolTaskById(@Param("id")String id);
- PatrolTask customizeGetById(@Param("id") String id);
+ PatrolTaskVO customizeGetById(@Param("id") String id);
+
/**
- * 巡查报表，市拿区
+ * 巡查报表，获取水库巡查报表数据
* @param patrolTaskReport
* @return
*/
- List<PatrolTaskReport> getTaskReportRegion(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+ List<PatrolTaskReport> getReservoirReportPage(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
- /**
- * 巡查报表，区拿水库
- * @param patrolTaskReport
- * @return
- */
- List<PatrolTaskReport> getTaskReportReservoir(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
-
- /**
- * 巡查报表，省拿市
- * @param page
- * @param patrolTaskReport
- * @return
- */
- List<PatrolTaskReport> getTaskReportProvince(IPage<PatrolTaskReport> page,@Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
/**
* 巡查报表详情 获取行政区下的水库
@@ -86,4 +74,29 @@
* @return
*/
List<PatrolTaskReport> getTaskReportDetailRegion(IPage<PatrolTaskReport> page,@Param("patrolTaskReport")PatrolTaskReport patrolTaskReport);
+
+
+
+
+
+ /**
+ * 巡查报表，获取水库巡查报表数据
+ * @param patrolTaskReport
+ * @return
+ */
+ 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> getRegionReportPage(IPage<PatrolTaskReport> page, @Param("patrolTaskReport") PatrolTaskReport patrolTaskReport);
+
+ List<PatrolTaskReport> getRegionReportList(@Param("patrolTaskReport")PatrolTaskReport patrolTaskReport);
}
--
Gitblit v1.9.3