作者 郭文星

123

@@ -34,14 +34,13 @@ class Car extends Base @@ -34,14 +34,13 @@ class Car extends Base
34 ->alias("a") 34 ->alias("a")
35 ->join("route b","a.route_id=b.id") 35 ->join("route b","a.route_id=b.id")
36 ->join("driver c","a.driver_id=c.id") 36 ->join("driver c","a.driver_id=c.id")
37 - ->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") 37 + ->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")
38 ->where("route_id",$route_id) 38 ->where("route_id",$route_id)
39 ->where("scheduling_type",1) 39 ->where("scheduling_type",1)
40 ->group("start_time") 40 ->group("start_time")
41 ->select(); 41 ->select();
42 42
43 // 查询临时线路车次 43 // 查询临时线路车次
44 -  
45 $statr_time=strtotime(date("Y-m-d",time())); 44 $statr_time=strtotime(date("Y-m-d",time()));
46 $end_time=$statr_time+86400; 45 $end_time=$statr_time+86400;
47 $temporary_route=Db::name("temporary_route") 46 $temporary_route=Db::name("temporary_route")
@@ -56,7 +55,7 @@ class Car extends Base @@ -56,7 +55,7 @@ class Car extends Base
56 ->alias("a") 55 ->alias("a")
57 ->join("route b","a.route_id=b.id") 56 ->join("route b","a.route_id=b.id")
58 ->join("driver c","a.driver_id=c.id") 57 ->join("driver c","a.driver_id=c.id")
59 - ->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") 58 + ->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")
60 ->where("route_id",$route_id) 59 ->where("route_id",$route_id)
61 ->where("a.id",$temporary_route[$k]['car_id']) 60 ->where("a.id",$temporary_route[$k]['car_id'])
62 ->group("start_time") 61 ->group("start_time")