From e95773cc4e824e616874f879f93db78b17455257 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 13 Jun 2022 16:40:44 +0800
Subject: [PATCH] 1、任务轨迹查询增加
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index d448395..16d8063 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -81,7 +81,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入task")
public R<IPage<TaskqdVO>> list(Taskqd taskqd, Query query) {
- IPage<Taskqd> pages = taskqdService.page(Condition.getPage(query), Condition.getQueryWrapper(taskqd));
+ IPage<Taskqd> pages = taskqdService.page(Condition.getPage(query), Condition.getQueryWrapper(taskqd).orderByDesc("time"));
return R.data(TaskqdWrapper.build().pageVO(pages));
}
@@ -414,6 +414,18 @@
}
/**
+ * 查询所有任务轨迹以及人员轨迹
+ * @return
+ */
+ @GetMapping("/queryAllTrar")
+ public R queryAllTrar() {
+ List<Map<String, Object>> allTask = taskqdService.allTask();
+
+
+ return R.data(allTask);
+ }
+
+ /**
* @param nowTime 当前时间
* @param startTime 开始时间
* @param endTime 结束时间
--
Gitblit v1.9.3