From 13b6d196199d6b73e5908db69d007606afaebe8b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 06 Feb 2024 16:09:06 +0800
Subject: [PATCH] 任务状态数量接口优化
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 fcfcfa9..8509dcd 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
@@ -186,7 +186,7 @@
*/
@PostMapping("start-process")
public R startProcess(@RequestBody PatrolTask patrolTask) {
- return R.status(patrolTaskService.startProcess(patrolTask));
+ return R.data(patrolTaskService.startProcess(patrolTask));
}
/**
@@ -266,8 +266,10 @@
BladeFlowVO<PatrolTask> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
- bladeFlow.setDetail(byId);
- bladeFlowVOList.add(bladeFlow);
+ if (byId != null){
+ bladeFlow.setDetail(byId);
+ bladeFlowVOList.add(bladeFlow);
+ }
});
}
//设置数据集
@@ -314,7 +316,20 @@
@GetMapping("getTaskStatusCount")
public R getTaskStatusCount(PatrolTaskVO patrolTaskVO){
- List<TaskStatusCount> list = patrolTaskService.getTaskStatusCount(patrolTaskVO);
+// List<TaskStatusCount> list = patrolTaskService.getTaskStatusCount(patrolTaskVO);
+ List<TaskStatusCount> list = patrolTaskService.getTaskStatusCountOptimize(patrolTaskVO);
+ return R.data(list);
+ }
+
+ @GetMapping("getTaskStatus")
+ public R getTaskStatus(PatrolTaskVO patrolTaskVO){
+ TaskStatus taskStatus = patrolTaskService.getTaskStatus(patrolTaskVO);
+ return R.data(taskStatus);
+ }
+
+ @GetMapping("getTaskStatusCountOptimize")
+ public R getTaskStatusCountOptimize(PatrolTaskVO patrolTaskVO){
+ List<TaskStatusCount> list = patrolTaskService.getTaskStatusCountOptimize(patrolTaskVO);
return R.data(list);
}
@@ -325,4 +340,6 @@
}
+
+
}
--
Gitblit v1.9.3