Pu Zhibing
2025-07-24 71a01448f9e6de4a05381a74e415b9f0964cddef
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
@@ -48,16 +48,31 @@
    @Override
    public Map<String, Object> queryCars(Integer uid) throws Exception {
        Driver driver = driverService.selectById(uid);
        List<Map<String, Object>> list = carMapper.queryIdleData(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
                driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
        Map<String, Object> map = new HashMap<>();
        map.put("list", list);
        Map<String, Object> map1 = driverService.queryInfo(uid);
        if(null == map1.get("licensePlate")){
            map.put("car", "");
        }else{
            map.put("car", map1.get("licensePlate") + "-" + map1.get("brand") + " " + map1.get("carColor"));
        Integer carId = driver.getCarId();
        map.put("car", "");
        if(carId!=null){
            Car car = carMapper.selectById(carId);
            if(car.getCarLicensePlate()!=null){
                CarBrand carBrand = carBrandMapper.selectById(car.getCarBrandId());
                CarModel carModel = carModelMapper.selectById(car.getCarModelId());
                map.put("car", car.getCarLicensePlate()+"-" + carBrand.getName() +carModel.getName()+ " " + car.getCarColor());
            }
        }
        List<Map<String, Object>> list = carMapper.queryIdleDataFromId(driver.getId());
//        List<Map<String, Object>> list = carMapper.queryIdleData(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
//                driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
        for (Map<String, Object> stringObjectMap : list) {
            // 1使用中 2空闲中
            if(stringObjectMap.get("id").toString().equals(carId.toString())){
                map.put("useState", 1);
            }else {
                map.put("useState", 0);
            }
        }
        map.put("list", list);
        return map;
    }