From c689f2d200bd884546aac8b87d33cbe53f03b5ba Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 25 Jan 2024 11:15:19 +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 ab7f142..a4aff95 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
@@ -2,11 +2,13 @@
import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.entity.PatrolRecord;
+import cn.gistack.sm.patrol.entity.PatrolReport;
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;
+import cn.gistack.sm.patrol.vo.RecordBatchVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,7 +39,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);
}
@@ -147,8 +149,27 @@
* @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);
}
+
+ /**
+ * 记录更新并且新增数据（适用于app处理）
+ */
+ @ApiOperation(value="巡查记录-记录更新并且新增数据", notes="巡查记录-记录更新并且新增数据")
+ @RequestMapping(value = "/updateThenSaveBatch", method = {RequestMethod.PUT,RequestMethod.POST})
+ public R updateThenSaveBatch(@RequestBody RecordBatchVO recordBatchVO){
+ return R.data(patrolRecordService.updateThenSaveBatch(recordBatchVO));
+ }
+
+ /**
+ * 获取历史记录
+ */
+ @ApiOperation(value="巡查记录-获取历史记录", notes="巡查记录-获取历史记录")
+ @RequestMapping(value = "/getHistoryRecord", method = {RequestMethod.PUT,RequestMethod.POST})
+ public R getHistoryRecord(PatrolRecordVO patrolRecordVO){
+ return R.data(patrolRecordService.getHistoryRecord(patrolRecordVO));
+ }
+
}
--
Gitblit v1.9.3