|
...
|
...
|
@@ -45,14 +45,12 @@ class Car extends Base |
|
|
|
$time = $this->request->param("time");
|
|
|
|
$res = Db::name("car")
|
|
|
|
->alias("a")
|
|
|
|
->join("route b", "a.route_id=b.id")
|
|
|
|
->join("route b", "b.id={$route_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,a.seat,a.license_plate")
|
|
|
|
->where("route_id", $route_id)
|
|
|
|
->where("scheduling_type", 1)
|
|
|
|
->where('find_in_set('.$route_id.',route_id)')
|
|
|
|
->group("start_time")
|
|
|
|
->select();
|
|
|
|
|
|
|
|
// 查询临时线路车次
|
|
|
|
$statr_time = strtotime(date("Y-m-d", time()));
|
|
|
|
$end_time = $statr_time + 86400;
|
|
...
|
...
|
@@ -66,7 +64,7 @@ class Car extends Base |
|
|
|
foreach ($temporary_route as $k => $v) {
|
|
|
|
$data[] = Db::name("car")
|
|
|
|
->alias("a")
|
|
|
|
->join("route b", "a.route_id=b.id")
|
|
|
|
->join("route b", "b.id={$route_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,a.seat,a.license_plate")
|
|
|
|
->where("route_id", $route_id)
|
|
...
|
...
|
@@ -696,7 +694,7 @@ class Car extends Base |
|
|
|
$car = Db::name("car")
|
|
|
|
->alias("a")
|
|
|
|
->join("driver b", "a.driver_id=b.id")
|
|
|
|
->where("route_id", $route_id)
|
|
|
|
->where('find_in_set('.$route_id.',route_id)')
|
|
|
|
->field("b.id,b.name,a.license_plate")
|
|
|
|
->select();
|
|
|
|
return $this->success("请求成功", $car);
|
...
|
...
|
|
