#
luxiaotao1123
2024-09-24 3472edd85b25bcff5f519fc3d358988cc10e0799
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
@@ -57,11 +57,15 @@
            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);