From aa5609bbc2f9edfd3cce95c41590b165d6960154 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 03 Apr 2023 19:53:57 +0800
Subject: [PATCH] 巡查记录接口，增加根据itemIds和groupId查询项id接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 4162ba0..b2e03f3 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
@@ -34,7 +34,7 @@
/**
* 分页列表查询
*/
- @ApiOperation(value="巡查类型-分页列表查询", notes="巡查类型-分页列表查询")
+ @ApiOperation(value="巡查记录-分页列表查询", notes="巡查记录-分页列表查询")
@GetMapping(value = "/list")
public R queryPageList(PatrolRecord patrolRecord, Query query) {
IPage<PatrolRecord> pageList = patrolRecordService.selectPatrolRecord(Condition.getPage(query),patrolRecord);
@@ -54,7 +54,7 @@
/**
* 添加
*/
- @ApiOperation(value="巡查类型-添加", notes="巡查类型-添加")
+ @ApiOperation(value="巡查记录-添加", notes="巡查记录-添加")
@PostMapping(value = "/add")
public R add(@RequestBody PatrolRecord patrolRecord) {
return R.data(patrolRecordService.save(patrolRecord));
@@ -63,7 +63,7 @@
/**
* 编辑
*/
- @ApiOperation(value="巡查类型-编辑", notes="巡查类型-编辑")
+ @ApiOperation(value="巡查记录-编辑", notes="巡查记录-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public R edit(@RequestBody PatrolRecord patrolRecord) {
return R.data(patrolRecordService.updateById(patrolRecord));
@@ -75,7 +75,7 @@
* @param id
* @return
*/
- @ApiOperation(value="巡查类型-通过id删除", notes="巡查类型-通过id删除")
+ @ApiOperation(value="巡查记录-通过id删除", notes="巡查记录-通过id删除")
@DeleteMapping(value = "/delete")
public R delete(@RequestParam(name="id",required=true) String id) {
return R.data(patrolRecordService.removeById(id));
@@ -87,7 +87,7 @@
* @param ids
* @return
*/
- @ApiOperation(value="巡查类型-批量删除", notes="巡查类型-批量删除")
+ @ApiOperation(value="巡查记录-批量删除", notes="巡查记录-批量删除")
@DeleteMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
return R.data(patrolRecordService.removeByIds(Arrays.asList(ids.split(","))));
@@ -99,7 +99,7 @@
* @param id
* @return
*/
- @ApiOperation(value="巡查类型-通过id查询", notes="巡查类型-通过id查询")
+ @ApiOperation(value="巡查记录-通过id查询", notes="巡查记录-通过id查询")
@GetMapping(value = "/queryById")
public R queryById(@RequestParam(name="id",required=true) String id) {
PatrolRecordVO patrolRecordVO = patrolRecordService.getDetail(id);
@@ -107,15 +107,26 @@
}
/**
- * 通过id查询
+ * 通过taskId,itemsIds查询(用来判断是否完成任务)
* @return
*/
- @ApiOperation(value="巡查类型-通过id查询", notes="巡查类型-通过id查询")
+ @ApiOperation(value="巡查记录-通过taskId,itemsIds查询", notes="巡查记录-通过taskId,itemsIds查询")
@GetMapping(value = "/getPatrolRecordByTaskId")
public R getPatrolRecordByTaskId(String taskId,String itemIds) {
List<PatrolGroupItemVO> list = patrolRecordService.getPatrolRecordByTaskId(taskId,itemIds);
return R.data(list);
}
+ /**
+ * 通过taskId,itemsIds查询(用来查询巡查记录)
+ * @return
+ */
+ @ApiOperation(value="巡查记录-通过itemId查询", notes="巡查记录-通过itemId查询")
+ @GetMapping(value = "/getByTaskIdAndItemId")
+ public R getByTaskIdAndItemId(String taskId,String itemIds){
+ List<PatrolRecordVO> list = patrolRecordService.getByTaskIdAndItemId(taskId,itemIds);
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3