新增需求

曾富康

2026-06-22 e4f50565f585ac3bb7355fe7b9da794bb855113f

 ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java

@@ -295,7 +295,7 @@
        // 快车
        if(type==1){
            page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(),
                    orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, null, travelId));
                    orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, null, abnormal, promotion, promotionUser,abnormalStatus, null, travelId));
            return super.packForBT(page);
            // 跨城
        }else if(type==2){
@@ -339,7 +339,7 @@
            List<Map<String, Object>> list=new ArrayList<>();
            if(type==1){
                list =  tOrderPrivateCarService.getPrivateCarOrderListExport(null, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(),
                        orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus, travelId);
                        orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, null, abnormal, promotion, promotionUser,abnormalStatus, travelId);
            }else if(type==2){
                list =  tOrderCrossCityService.getCrossCityOrderListExport(null, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, null, state, abnormal, promotion, promotionUser,abnormalStatus, travelId);
            }else if(type==3){