From 1df02b011c951ed5f57e40663e014fd913cbbe20 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 May 2023 19:44:53 +0800
Subject: [PATCH] 巡检报表接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
index 9768aaf..4e14d8e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -124,7 +124,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(patrolTaskService.removeById(id));
}
@@ -136,7 +136,7 @@
* @return
*/
@ApiOperation(value = "巡查任务-批量删除", notes = "巡查任务-批量删除")
- @DeleteMapping(value = "/deleteBatch")
+ @PostMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
return R.data(patrolTaskService.removeByIds(Arrays.asList(ids.split(","))));
}
@@ -290,9 +290,19 @@
*/
@PostMapping("getTaskReport")
@ApiOperation(value = "巡查任务报表")
- public R getTaskReport(@RequestBody PatrolTaskReport patrolTaskReport) {
- List<PatrolTaskReport> list = patrolTaskService.getTaskReport(patrolTaskReport);
- return R.data(list);
+ public R getTaskReport( PatrolTaskReport patrolTaskReport , Query query) {
+ IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReport(Condition.getPage(query),patrolTaskReport);
+ return R.data(pageList);
+ }
+
+ /**
+ * 巡查任务报表
+ */
+ @PostMapping("getTaskReportDetail")
+ @ApiOperation(value = "巡查任务报表")
+ public R getTaskReportDetail( PatrolTaskReport patrolTaskReport , Query query) {
+ IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportDetail(Condition.getPage(query),patrolTaskReport);
+ return R.data(pageList);
}
--
Gitblit v1.9.3