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/PatrolConfigController.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java
index ca7d5e7..3820306 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java
@@ -37,8 +37,8 @@
 	@ApiOperation(value="巡查设置-分页列表查询", notes="巡查设置-分页列表查询")
 	@GetMapping(value = "/list")
 	public R<IPage<PatrolConfig>> queryPageList(PatrolConfig patrolConfig,Query query) {
-//		IPage<PatrolConfig> pageList =  patrolConfigService.selectPatrolConfig(Condition.getPage(query),patrolConfig);
-		IPage<PatrolConfig> pageList = patrolConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolConfig));
+		IPage<PatrolConfig> pageList =  patrolConfigService.selectPatrolConfig(Condition.getPage(query),patrolConfig);
+//		IPage<PatrolConfig> pageList = patrolConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolConfig));
 		return R.data(pageList);
 	}
 
@@ -73,9 +73,8 @@
 	 * @return
 	 */
 	@ApiOperation(value="巡查设置-通过id删除", notes="巡查设置-通过id删除")
-	@DeleteMapping(value = "/delete")
+	@PostMapping(value = "/delete")
 	public R delete(@RequestParam(name="id",required=true) String id) {
-		patrolConfigService.removeById(id);
 		return R.data(patrolConfigService.removeById(id));
 	}
 
@@ -86,7 +85,7 @@
 	 * @return
 	 */
 	@ApiOperation(value="巡查设置-批量删除", notes="巡查设置-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+	@PostMapping(value = "/deleteBatch")
 	public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		return R.data(this.patrolConfigService.removeByIds(Arrays.asList(ids.split(","))));
 	}

--
Gitblit v1.9.3