From b176ddd3a9acdd1eef2e7eb9c0cef5fa620334b4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 12 Jul 2023 16:03:53 +0800
Subject: [PATCH] 巡查逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 4e14d8e..cca7670 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
@@ -229,7 +229,7 @@
List<Object> data = res.getData().getData();
data.forEach(obj -> {
BladeFlow bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlow.class);
- PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
+ PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
if (byId != null) {
byId.setFlow(bladeFlow);
patrolTaskList.add(byId);
@@ -254,7 +254,7 @@
* @param patrolTask 任务
*/
@PostMapping("patrol-done-list")
- @ApiOperation(value = "查询待办")
+ @ApiOperation(value = "查询已办")
public R patrolDoneList(PatrolTaskVO patrolTask, Query query) {
BladeFlowVO bladeFlow2 = new BladeFlowVO();
//设置流程类型
@@ -267,7 +267,7 @@
List<Object> data = res.getData().getData();
data.forEach(obj -> {
BladeFlowVO<PatrolTask> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
- PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
+ PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
bladeFlow.setDetail(byId);
bladeFlowVOList.add(bladeFlow);
@@ -286,20 +286,30 @@
}
/**
- * 巡查任务报表
+ * 巡查任务报表 分页
*/
- @PostMapping("getTaskReport")
+ @GetMapping("getTaskReportPage")
@ApiOperation(value = "巡查任务报表")
- public R getTaskReport( PatrolTaskReport patrolTaskReport , Query query) {
- IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReport(Condition.getPage(query),patrolTaskReport);
+ public R getTaskReportPage( PatrolTaskReport patrolTaskReport , Query query) {
+ IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportPage(Condition.getPage(query),patrolTaskReport);
return R.data(pageList);
}
/**
- * 巡查任务报表
+ * 巡查任务报表列表
*/
- @PostMapping("getTaskReportDetail")
+ @GetMapping("getTaskReportList")
@ApiOperation(value = "巡查任务报表")
+ public R getTaskReportList( PatrolTaskReport patrolTaskReport ) {
+ List<PatrolTaskReport> list = patrolTaskService.getTaskReportList(patrolTaskReport);
+ return R.data(list);
+ }
+
+ /**
+ * 巡查任务报表详情
+ */
+ @GetMapping("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