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/PatrolTypeController.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTypeController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTypeController.java
index 0a1b4be..97d3a3d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTypeController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTypeController.java
@@ -1,6 +1,7 @@
 package cn.gistack.sm.patrol.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -42,9 +43,19 @@
 	@ApiOperation(value="巡查类型-分页列表查询", notes="巡查类型-分页列表查询")
 	@GetMapping(value = "/list")
 	public R queryPageList(PatrolType patrolType,Query query) {
-//		IPage<PatrolType> pageList = patrolTypeService.selectPatrolType(Condition.getPage(query),patrolType);
-		IPage<PatrolType> pageList = patrolTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolType));
+		IPage<PatrolType> pageList = patrolTypeService.selectPatrolType(Condition.getPage(query),patrolType);
+//		IPage<PatrolType> pageList = patrolTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolType));
 		return R.data(pageList);
+	}
+
+	 /**
+	  * 获取所有巡查类型
+	  */
+	 @ApiOperation(value="获取所有巡查类型", notes="获取所有巡查类型")
+	 @GetMapping(value = "/all")
+	public R getAll(){
+		List<PatrolType> list = patrolTypeService.list();
+		return R.data(list);
 	}
 
 	/**
@@ -78,7 +89,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(patrolTypeService.removeById(id));
 	}
@@ -90,7 +101,7 @@
 	 * @return
 	 */
 	@ApiOperation(value="巡查类型-批量删除", notes="巡查类型-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+	@PostMapping(value = "/deleteBatch")
 	public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		return R.data(patrolTypeService.removeByIds(Arrays.asList(ids.split(","))));
 	}

--
Gitblit v1.9.3