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/controller/PatrolGroupController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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..b2c6984 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
@@ -75,7 +75,7 @@
* @return
*/
@ApiOperation(value = "巡查指标组-通过id删除", notes = "巡查指标组-通过id删除")
- @DeleteMapping(value = "/delete")
+ @PostMapping(value = "/delete")
public R delete(@RequestParam(name = "id", required = true) String id) {
return R.data(patrolGroupService.removeById(id));
}
@@ -87,7 +87,7 @@
* @return
*/
@ApiOperation(value = "巡查指标组-批量删除", notes = "巡查指标组-批量删除")
- @DeleteMapping(value = "/deleteBatch")
+ @PostMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
return R.data(patrolGroupService.removeByIds(Arrays.asList(ids.split(","))));
}
@@ -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