From 200f9e99bab7dcab9360f34fa25f6fa97c33c167 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 05 Mar 2024 14:59:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 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 a1b0d6f..651ba80 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
@@ -9,6 +9,7 @@
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
import cn.gistack.sm.patrol.vo.RecordBatchVO;
+import cn.gistack.sm.patrol.vo.RecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -39,7 +40,7 @@
*/
@ApiOperation(value="巡查记录-分页列表查询", notes="巡查记录-分页列表查询")
@GetMapping(value = "/list")
- public R queryPageList(PatrolRecord patrolRecord, Query query) {
+ public R queryPageList(PatrolRecordVO patrolRecord, Query query) {
IPage<PatrolRecord> pageList = patrolRecordService.selectPatrolRecord(Condition.getPage(query),patrolRecord);
return R.data(pageList);
}
@@ -149,8 +150,8 @@
* @return
*/
@GetMapping(value = "/getByTaskIdAndGroupId")
- public R getByTaskIdAndGroupId(String groupId,String taskId){
- List<PatrolRecord> list = patrolRecordService.getByTaskIdAndGroupId(groupId,taskId);
+ public R getByTaskIdAndGroupId(PatrolRecordVO patrolRecordVO){
+ List<PatrolRecord> list = patrolRecordService.getByTaskIdAndGroupId(patrolRecordVO);
return R.data(list);
}
@@ -171,4 +172,24 @@
public R getHistoryRecord(PatrolRecordVO patrolRecordVO){
return R.data(patrolRecordService.getHistoryRecord(patrolRecordVO));
}
+
+ @GetMapping("getRecordDetail")
+ public R getRecordVO(RecordVO recordVO){
+ RecordVO detail = patrolRecordService.getRecordVO(recordVO);
+ return R.data(detail);
+ }
+
+ /**
+ * 获取处理情况
+ * @param patrolRecord
+ * @return
+ */
+ @GetMapping("getHandleRecord")
+ public R getHandleRecord(PatrolRecord patrolRecord){
+
+ PatrolRecordVO res = patrolRecordService.getHandleRecord(patrolRecord);
+ return R.data(res);
+ }
+
+
}
--
Gitblit v1.9.3