From b112d242575fe96123b1e8dad434f46e6d2bb3d1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 03 Jun 2023 17:57:15 +0800
Subject: [PATCH] 巡查，智能外呼定时任务相关代码抽离修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
index 8b8e7fe..ab7f142 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
@@ -43,12 +43,12 @@
}
/**
- * 获取所有巡查类型
+ * 获取所有巡查记录
*/
@ApiOperation(value="获取所有巡查类型", notes="获取所有巡查类型")
@GetMapping(value = "/all")
- public R getAll(){
- List<PatrolRecord> list = patrolRecordService.list();
+ public R getAll(PatrolRecord patrolRecord){
+ List<PatrolRecord> list = patrolRecordService.list(Condition.getQueryWrapper(patrolRecord));
return R.data(list);
}
@@ -77,7 +77,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(patrolRecordService.removeById(id));
}
@@ -89,7 +89,7 @@
* @return
*/
@ApiOperation(value="巡查记录-批量删除", notes="巡查记录-批量删除")
- @DeleteMapping(value = "/deleteBatch")
+ @PostMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
return R.data(patrolRecordService.removeByIds(Arrays.asList(ids.split(","))));
}
@@ -130,7 +130,7 @@
}
/**
- * 通过itemIds查询
+ * 通过itemIds查询(用于巡查上报时的回显)
*
* @return
*/
@@ -141,5 +141,14 @@
return R.data(list);
}
-
+ /**
+ * 通过任务id和组id获取记录表中的数据,用于数据回显
+ *
+ * @return
+ */
+ @GetMapping(value = "/getByTaskIdAndGroupId")
+ public R getByTaskIdAndGroupId(String groupId,String taskId){
+ List<PatrolRecord> list = patrolRecordService.getByTaskIdAndGroupId(groupId,taskId);
+ return R.data(list);
+ }
}
--
Gitblit v1.9.3