#

luxiaotao1123

2024-09-23 b7f7acbb6dec716aa7faa38a72118867779fe5ca

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

@@ -1,17 +1,20 @@
package com.zy.acs.manager.manager.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.annotation.OperationLog;
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.manager.controller.param.BusCreateParam;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Bus;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.BusStsType;
import com.zy.acs.manager.manager.service.BusService;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.StaService;
@@ -39,13 +42,19 @@
    private LocService locService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private BusinessSortService businessSortService;

    @PreAuthorize("hasAuthority('manager:bus:list')")
    @PostMapping("/bus/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Bus, BaseParam> pageParam = new PageParam<>(baseParam, Bus.class);
        PageParam<Bus, BaseParam> page = busService.page(pageParam, pageParam.buildWrapper(true));
        QueryWrapper<Bus> wrapper = pageParam.buildWrapper(true);
        if (createTimeDesc(pageParam.getOrders())) {
            wrapper.last(businessSortService.getSql(BusStsType.class, "bus_sts"));
        }
        PageParam<Bus, BaseParam> page = busService.page(pageParam, wrapper);
        for (Bus record : page.getRecords()) {
            List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBusId, record.getId()));
            if (!Cools.isEmpty(tasks)) {