Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

2025-08-04 2ea7c30be31b05877e8324edb85d08173e07a8c6

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCrossCityServiceImpl.java

@@ -1,10 +1,13 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.TCompany;
import com.stylefeng.guns.modular.system.model.TOrderCrossCity;
import com.stylefeng.guns.modular.system.dao.TOrderCrossCityMapper;
import com.stylefeng.guns.modular.system.service.ITCompanyService;
import com.stylefeng.guns.modular.system.service.ITOrderCrossCityService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -26,9 +29,42 @@
    @Resource
    private TOrderCrossCityMapper orderCrossCityMapper;

    @Autowired
    private ITCompanyService companyService;

    @Override
    public List<Map<String, Object>> getCrossCityOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer lineId, Integer state) {
        return this.baseMapper.getCrossCityOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state);
    public List<Map<String, Object>> getCrossCityOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer lineId, Integer state, Integer abnormal,
                                                           Integer promotion,
                                                           String promotionUser,
                                                           Integer abnormalStatus) {
        List<Map<String, Object>> crossCityOrderList = this.baseMapper.getCrossCityOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state, abnormal, promotion, promotionUser, abnormalStatus);
        for (Map<String, Object> map : crossCityOrderList) {
            if(null != map.get("companyId")){
                TCompany company = companyService.selectById(map.get("companyId").toString());
                if(company!=null){
                    map.put("companyName", company.getName());
                }
            }
        }
        return crossCityOrderList;
    }
    @Override
    public List<Map<String, Object>> getCrossCityOrderListExport(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer lineId, Integer state, Integer abnormal,
                                                           Integer promotion,
                                                           String promotionUser,
                                                           Integer abnormalStatus) {
        List<Map<String, Object>> crossCityOrderListExport = this.baseMapper.getCrossCityOrderListExport(beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state, abnormal, promotion, promotionUser, abnormalStatus);

        for (Map<String, Object> stringObjectMap : crossCityOrderListExport) {
            if(null != stringObjectMap.get("companyId")){
                TCompany company = companyService.selectById(stringObjectMap.get("companyId").toString());
                if(company!=null){
                    stringObjectMap.put("companyName", company.getName());
                }
            }
        }

        return crossCityOrderListExport;
    }

    @Override