From a9e1499b7ac94fceb5edcdf47d6c66f560b4112f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 04 Apr 2023 17:16:01 +0800
Subject: [PATCH] 巡检任务添加字段，添加详情页
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 b2e03f3..c623a5b 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
@@ -3,6 +3,7 @@
import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolType;
+import cn.gistack.sm.patrol.service.IPatrolGroupItemService;
import cn.gistack.sm.patrol.service.IPatrolRecordService;
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
@@ -42,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);
}
@@ -128,5 +129,17 @@
return R.data(list);
}
+ /**
+ * 通过itemIds查询
+ *
+ * @return
+ */
+ @ApiOperation(value="巡查指标项目-通过itemIds查询", notes="巡查指标项目-通过itemIds查询")
+ @GetMapping(value = "/getItemByItemIds")
+ public R getItemByItemIds(String itemIds,String groupId,String taskId){
+ List list = patrolRecordService.getItemByItemIds(itemIds,groupId,taskId);
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3