From 3493d451eb51919445c6de4ce14eb36ff71615c0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 20 Jul 2023 10:22:34 +0800
Subject: [PATCH] 巡查次数和隐患数量统计接口

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
index c1dcd82..5bded52 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
@@ -38,10 +38,9 @@
 
 	@GetMapping("/page")
 	@ApiOperation(value = "列表", notes = "传入实体类参数")
-	public R<IPage<DangerReport>> pageList(@RequestParam Map<String, Object> dr, Query query) {
-		QueryWrapper<DangerReport> queryWrapper = Condition.getQueryWrapper(dr,DangerReport.class);
-		IPage<DangerReport> pagelist = dangerReportService.page(Condition.getPage(query),queryWrapper);
-		return R.data(pagelist);
+	public R<IPage<DangerReportVO>> pageList(DangerReportVO dangerReportVO, Query query) {
+		IPage<DangerReportVO> page = dangerReportService.selectPage(Condition.getPage(query),dangerReportVO);
+		return R.data(page);
 	}
 
 	@GetMapping("/all")
@@ -96,4 +95,14 @@
 		return R.data(dangerReportService.removeBatchByIds(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 获取水库巡查次数和险情问题数量
+	 * @param resGuid
+	 * @return
+	 */
+	@GetMapping("/getStatistics")
+	public R getStatistics(String resGuid){
+		return R.data(dangerReportService.getStatistics(resGuid));
+	}
+
 }

--
Gitblit v1.9.3