...
|
...
|
@@ -34,14 +34,13 @@ class Car extends Base |
|
|
->alias("a")
|
|
|
->join("route b","a.route_id=b.id")
|
|
|
->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")
|
|
|
->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,a.seat")
|
|
|
->where("route_id",$route_id)
|
|
|
->where("scheduling_type",1)
|
|
|
->group("start_time")
|
|
|
->select();
|
|
|
|
|
|
// 查询临时线路车次
|
|
|
|
|
|
$statr_time=strtotime(date("Y-m-d",time()));
|
|
|
$end_time=$statr_time+86400;
|
|
|
$temporary_route=Db::name("temporary_route")
|
...
|
...
|
@@ -56,7 +55,7 @@ class Car extends Base |
|
|
->alias("a")
|
|
|
->join("route b","a.route_id=b.id")
|
|
|
->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")
|
|
|
->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,a.seat")
|
|
|
->where("route_id",$route_id)
|
|
|
->where("a.id",$temporary_route[$k]['car_id'])
|
|
|
->group("start_time")
|
...
|
...
|
|