1

zhang

2025-06-17 bc64b3b45cf00885696aea4cfa97230390717012

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java

@@ -9,7 +9,7 @@
import com.zy.acs.manager.common.domain.*;
import com.zy.acs.manager.common.utils.BusinessSortService;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.core.service.MainLxtService;
import com.zy.acs.manager.manager.controller.param.BusCreateParam;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Bus;
@@ -37,7 +37,7 @@
    @Autowired
    private BusService busService;
    @Autowired
    private MainService mainService;
    private MainLxtService mainService;
    @Autowired
    private StaService staService;
    @Autowired
@@ -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);