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

转到一个项目

作者 郭文星
提交 3ece4a14769edf2002d9ad62df7dcd6f8059aee6 1 个父辈 a450e147

123

内嵌 并排对比
正在显示 3 个修改的文件 包含 6 行增加 和 8 行删除
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <div class="form-group"> 15 <div class="form-group">
16 <label class="control-label col-xs-12 col-sm-2">{:__('Route_id')}:</label> 16 <label class="control-label col-xs-12 col-sm-2">{:__('Route_id')}:</label>
17 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
18 - <input id="c-route_id" data-rule="required" data-source="route/index" class="form-control selectpage" name="row[route_id]" type="text" value=""> 18 + <input id="c-route_id" data-rule="required" data-multiple="true" data-source="route/index" class="form-control selectpage" name="row[route_id]" type="text" value="">
19 </div> 19 </div>
20 </div> 20 </div>
21 <div class="form-group"> 21 <div class="form-group">
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <div class="form-group"> 15 <div class="form-group">
16 <label class="control-label col-xs-12 col-sm-2">{:__('Route_id')}:</label> 16 <label class="control-label col-xs-12 col-sm-2">{:__('Route_id')}:</label>
17 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
18 - <input id="c-route_id" data-rule="required" data-source="route/index" class="form-control selectpage" name="row[route_id]" type="text" value="{$row.route_id|htmlentities}"> 18 + <input id="c-route_id" data-rule="required" data-multiple="true" data-source="route/index" class="form-control selectpage" name="row[route_id]" type="text" value="{$row.route_id|htmlentities}">
19 </div> 19 </div>
20 </div> 20 </div>
21 <div class="form-group"> 21 <div class="form-group">
@@ -45,14 +45,12 @@ class Car extends Base @@ -45,14 +45,12 @@ class Car extends Base
45 $time = $this->request->param("time"); 45 $time = $this->request->param("time");
46 $res = Db::name("car") 46 $res = Db::name("car")
47 ->alias("a") 47 ->alias("a")
48 - ->join("route b", "a.route_id=b.id") 48 + ->join("route b", "b.id={$route_id}")
49 ->join("driver c", "a.driver_id=c.id") 49 ->join("driver c", "a.driver_id=c.id")
50 ->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") 50 ->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")
51 - ->where("route_id", $route_id)  
52 - ->where("scheduling_type", 1) 51 + ->where('find_in_set('.$route_id.',route_id)')
53 ->group("start_time") 52 ->group("start_time")
54 ->select(); 53 ->select();
55 -  
56 // 查询临时线路车次 54 // 查询临时线路车次
57 $statr_time = strtotime(date("Y-m-d", time())); 55 $statr_time = strtotime(date("Y-m-d", time()));
58 $end_time = $statr_time + 86400; 56 $end_time = $statr_time + 86400;
@@ -66,7 +64,7 @@ class Car extends Base @@ -66,7 +64,7 @@ class Car extends Base
66 foreach ($temporary_route as $k => $v) { 64 foreach ($temporary_route as $k => $v) {
67 $data[] = Db::name("car") 65 $data[] = Db::name("car")
68 ->alias("a") 66 ->alias("a")
69 - ->join("route b", "a.route_id=b.id") 67 + ->join("route b", "b.id={$route_id}")
70 ->join("driver c", "a.driver_id=c.id") 68 ->join("driver c", "a.driver_id=c.id")
71 ->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") 69 ->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")
72 ->where("route_id", $route_id) 70 ->where("route_id", $route_id)
@@ -696,7 +694,7 @@ class Car extends Base @@ -696,7 +694,7 @@ class Car extends Base
696 $car = Db::name("car") 694 $car = Db::name("car")
697 ->alias("a") 695 ->alias("a")
698 ->join("driver b", "a.driver_id=b.id") 696 ->join("driver b", "a.driver_id=b.id")
699 - ->where("route_id", $route_id) 697 + ->where('find_in_set('.$route_id.',route_id)')
700 ->field("b.id,b.name,a.license_plate") 698 ->field("b.id,b.name,a.license_plate")
701 ->select(); 699 ->select();
702 return $this->success("请求成功", $car); 700 return $this->success("请求成功", $car);