From aa2004ef65a3d8c8e15ec1689fc4f8e1b8d91c59 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:41 +0800
Subject: [PATCH] 巡检申报增加水库字段
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 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..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,18 +39,18 @@
*/
@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);
}
/**
- * 获取所有巡查类型
+ * 获取所有巡查记录
*/
@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 +79,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 +91,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 +132,7 @@
}
/**
- * 通过itemIds查询
+ * 通过itemIds查询(用于巡查上报时的回显)
*
* @return
*/
@@ -141,5 +143,33 @@
return R.data(list);
}
+ /**
+ * 通过任务id和组id获取记录表中的数据,用于数据回显
+ *
+ * @return
+ */
+ @GetMapping(value = "/getByTaskIdAndGroupId")
+ 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