From 7100219174b447399a00a42d5ba275a20de1334e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 十月 2024 16:05:31 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
index 02329f3..d959c93 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
@@ -54,14 +54,18 @@
PageParam<Bus, BaseParam> pageParam = new PageParam<>(baseParam, Bus.class);
QueryWrapper<Bus> wrapper = pageParam.buildWrapper(true);
if (hasCreateTimeDesc(pageParam.getOrders())) {
- wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
+// wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
}
PageParam<Bus, BaseParam> page = busService.page(pageParam, wrapper);
+
+ long taskCompleteSts = TaskStsType.COMPLETE.val();
+ long taskCancelSts = TaskStsType.CANCEL.val();
for (Bus record : page.getRecords()) {
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBusId, record.getId()));
if (!Cools.isEmpty(tasks)) {
record.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
- record.setTasksNum(tasks.size());
+ record.setTasksNum((int)tasks.stream().filter(task -> task.getTaskSts() != taskCompleteSts && task.getTaskSts() != taskCancelSts).count());
+ record.setTasksNumTotal(tasks.size());
}
}
return R.ok().add(page);
--
Gitblit v1.9.1