郭文星 / wyc.tenyes.cn · 提交

转到一个项目

作者 郭文星
提交 056e986adc06d5ad3900f2f065ffa600a4531f7e 1 个父辈 106c6dcb

123

内嵌 并排对比
正在显示 1 个修改的文件 包含 2 行增加 和 2 行删除
@@ -34,7 +34,7 @@ class Car extends Base @@ -34,7 +34,7 @@ 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,a.seat") 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,a.license_plate")
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")
@@ -55,7 +55,7 @@ class Car extends Base @@ -55,7 +55,7 @@ class Car extends Base
55 ->alias("a") 55 ->alias("a")
56 ->join("route b","a.route_id=b.id") 56 ->join("route b","a.route_id=b.id")
57 ->join("driver c","a.driver_id=c.id") 57 ->join("driver c","a.driver_id=c.id")
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") 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,a.license_plate")
59 ->where("route_id",$route_id) 59 ->where("route_id",$route_id)
60 ->where("a.id",$temporary_route[$k]['car_id']) 60 ->where("a.id",$temporary_route[$k]['car_id'])
61 ->group("start_time") 61 ->group("start_time")