|
|
|
|
@ -176,6 +176,10 @@ class OrdersController extends CommonController
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (request()->bed_id) {
|
|
|
|
|
$model = $model->where('bed_id', request()->bed_id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (request()->days) {
|
|
|
|
|
$model = $model->whereRaw(DB::raw("datediff(`to_date`,`from_date`) = " . (request()->days - 1)));
|
|
|
|
|
}
|
|
|
|
|
@ -453,7 +457,7 @@ class OrdersController extends CommonController
|
|
|
|
|
->select("area.id", "area.name", "area.building_id")
|
|
|
|
|
->leftJoin("building", "building.id", "=", "area.building_id")
|
|
|
|
|
->addSelect("building.name as building_name")
|
|
|
|
|
// ->orderBy("building_name")
|
|
|
|
|
// ->orderBy("building_name")
|
|
|
|
|
->orderBy("area.myindex")
|
|
|
|
|
//->orderBy("area.name")
|
|
|
|
|
->get();
|
|
|
|
|
|