From 1df02b011c951ed5f57e40663e014fd913cbbe20 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 May 2023 19:44:53 +0800
Subject: [PATCH] 巡检报表接口

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
index 4418e5e..4e14d8e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -290,9 +290,19 @@
 	 */
 	@PostMapping("getTaskReport")
 	@ApiOperation(value = "巡查任务报表")
-	public R getTaskReport(@RequestBody PatrolTaskReport patrolTaskReport) {
-		List<PatrolTaskReport> list = patrolTaskService.getTaskReport(patrolTaskReport);
-		return R.data(list);
+	public R getTaskReport( PatrolTaskReport patrolTaskReport , Query query) {
+		IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReport(Condition.getPage(query),patrolTaskReport);
+		return R.data(pageList);
+	}
+
+	/**
+	 * 巡查任务报表
+	 */
+	@PostMapping("getTaskReportDetail")
+	@ApiOperation(value = "巡查任务报表")
+	public R getTaskReportDetail( PatrolTaskReport patrolTaskReport , Query query) {
+		IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportDetail(Condition.getPage(query),patrolTaskReport);
+		return R.data(pageList);
 	}
 
 

--
Gitblit v1.9.3