From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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..36f5e0c 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);
}
@@ -75,7 +75,6 @@
@ApiOperation(value="巡查设置-通过id删除", notes="巡查设置-通过id删除")
@DeleteMapping(value = "/delete")
public R delete(@RequestParam(name="id",required=true) String id) {
- patrolConfigService.removeById(id);
return R.data(patrolConfigService.removeById(id));
}
--
Gitblit v1.9.3