From 684d583978a4f0d4b0bd88ad46ad2f6238d185c8 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 24 Apr 2023 16:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java
index 688c1bb..7b98be2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java
@@ -156,4 +156,20 @@
public R getAllPatrolGroupByTaskId(String taskId) {
return R.data(patrolGroupService.getAllPatrolGroupByTaskId(taskId));
}
+
+ /**
+ * 根据任务id获取巡查组，返回组下的record
+ */
+ @GetMapping(value = "/getPatrolGroupDTO")
+ public R getPatrolGroupDTO(String taskId) {
+ return R.data(patrolGroupService.getPatrolGroupDTO(taskId));
+ }
+
+ /**
+ * 根据任务id获取巡查组
+ */
+ @GetMapping(value = "/getPatrolGroupByTaskId")
+ public R getPatrolGroupByTaskId(String taskId) {
+ return R.data(patrolGroupService.getPatrolGroupByTaskId(taskId));
+ }
}
--
Gitblit v1.9.3