From b112d242575fe96123b1e8dad434f46e6d2bb3d1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 03 Jun 2023 17:57:15 +0800
Subject: [PATCH] 巡查，智能外呼定时任务相关代码抽离修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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..551c13b 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);
@@ -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,17 +286,27 @@
}
/**
- * 巡查任务报表
+ * 巡查任务报表 分页
*/
- @PostMapping("getTaskReport")
+ @PostMapping("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("getTaskReportList")
+ @ApiOperation(value = "巡查任务报表")
+ public R getTaskReportList( PatrolTaskReport patrolTaskReport ) {
+ List<PatrolTaskReport> list = patrolTaskService.getTaskReportList(patrolTaskReport);
+ return R.data(list);
+ }
+
+ /**
+ * 巡查任务报表 分页
*/
@PostMapping("getTaskReportDetail")
@ApiOperation(value = "巡查任务报表")
--
Gitblit v1.9.3