123

@@ -33,8 +33,10 @@ class Car extends Base
         $res=Db::name("car")
         $res=Db::name("car")
             ->alias("a")
             ->alias("a")
             ->join("route b","a.route_id=b.id")
             ->join("route b","a.route_id=b.id")
-            ->field("a.id,b.id as route_id,DATE_FORMAT(FROM_UNIXTIME(a.reservation_time), '%H:%i') AS reservation_time ,DATE_FORMAT(FROM_UNIXTIME(a.start_time), '%H:%i') AS start_time ,b.price")
+            ->join("driver c","a.driver_id=c.id")
+            ->field("a.id,b.id as route_id,c.id as driver_id,DATE_FORMAT(FROM_UNIXTIME(a.reservation_time), '%H:%i') AS reservation_time ,DATE_FORMAT(FROM_UNIXTIME(a.start_time), '%H:%i') AS start_time ,b.price")
             ->where("route_id",$route_id)
             ->where("route_id",$route_id)
+            ->where("scheduling_type",1)
             ->group("start_time")
             ->group("start_time")
             ->select();
             ->select();