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/service/IPatrolTaskService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
index 58d2216..04e6ca5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
@@ -62,7 +62,7 @@
boolean chargeCompletePerson(BladeFlowTask bladeFlowTask);
- PatrolTask customizeGetById(String businessId);
+ PatrolTaskVO customizeGetById(String businessId);
List<PatrolTask> getAll(PatrolTaskVO patrolTaskVO);
@@ -71,5 +71,9 @@
* @param patrolTaskReport
* @return
*/
- List<PatrolTaskReport> getTaskReport(PatrolTaskReport patrolTaskReport);
+ IPage<PatrolTaskReport> getTaskReportPage(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport);
+
+ IPage<PatrolTaskReport> getTaskReportDetail(IPage<PatrolTaskReport> page, PatrolTaskReport patrolTaskReport);
+
+ List<PatrolTaskReport> getTaskReportList(PatrolTaskReport patrolTaskReport);
}
--
Gitblit v1.9.3