1
This commit is contained in:
@@ -50,7 +50,7 @@ class VehicleController
|
|||||||
{
|
{
|
||||||
|
|
||||||
$lang = $request->post('lang', 'zh');
|
$lang = $request->post('lang', 'zh');
|
||||||
$status = $request->post('status', '4');
|
$status = $request->post('status', '');
|
||||||
// 接收请求参数(Webman自动注入)
|
// 接收请求参数(Webman自动注入)
|
||||||
$page = $request->post('page', 1); // 默认第1页
|
$page = $request->post('page', 1); // 默认第1页
|
||||||
$pageSize = $request->post('pageSize', 30); // 默认每页30条
|
$pageSize = $request->post('pageSize', 30); // 默认每页30条
|
||||||
@@ -70,22 +70,38 @@ class VehicleController
|
|||||||
|
|
||||||
switch ($lang) {
|
switch ($lang) {
|
||||||
case 'zh':
|
case 'zh':
|
||||||
$vehicles = Vehicle::with('location')->with('finalLocation')->where($where)->whereIn('status',$status)->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
|
$vehicles = Vehicle::with('location')->with('finalLocation')->where($where);
|
||||||
|
if(!empty($status)){
|
||||||
|
$vehicles = $vehicles->whereIn('status',$status);
|
||||||
|
}
|
||||||
|
$vehicles = $vehicles->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
|
||||||
$hz = new Location();
|
$hz = new Location();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'en':
|
case 'en':
|
||||||
$vehicles = VehicleEn::with('location')->with('finalLocation')->where($where)->whereIn('status',$status)->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
|
$vehicles = VehicleEn::with('location')->with('finalLocation')->where($where);
|
||||||
|
if(!empty($status)){
|
||||||
|
$vehicles = $vehicles->whereIn('status',$status);
|
||||||
|
}
|
||||||
|
$vehicles = $vehicles->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
|
||||||
$hz = new LocationEn();
|
$hz = new LocationEn();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'ru':
|
case 'ru':
|
||||||
$vehicles = VehicleRu::with('location')->with('finalLocation')->where($where)->whereIn('status',$status)->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
|
$vehicles = VehicleRu::with('location')->with('finalLocation')->where($where);
|
||||||
|
if(!empty($status)){
|
||||||
|
$vehicles = $vehicles->whereIn('status',$status);
|
||||||
|
}
|
||||||
|
$vehicles = $vehicles->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
|
||||||
$hz = new LocationRu();
|
$hz = new LocationRu();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'ar':
|
case 'ar':
|
||||||
$vehicles = VehicleAr::with('location')->with('finalLocation')->where($where)->whereIn('status',$status)->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
|
$vehicles = VehicleAr::with('location')->with('finalLocation')->where($where);
|
||||||
|
if(!empty($status)){
|
||||||
|
$vehicles = $vehicles->whereIn('status',$status);
|
||||||
|
}
|
||||||
|
$vehicles = $vehicles->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
|
||||||
$hz = new LocationAr();
|
$hz = new LocationAr();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -154,7 +170,12 @@ class VehicleController
|
|||||||
}
|
}
|
||||||
unset($vehicle);
|
unset($vehicle);
|
||||||
// =================================== new ===================================== end
|
// =================================== new ===================================== end
|
||||||
$count = Vehicle::where($where)->whereIn('status',$status)->count();
|
|
||||||
|
if(!empty($status)){
|
||||||
|
$count = Vehicle::where($where)->whereIn('status',$status)->count();
|
||||||
|
} else {
|
||||||
|
$count = Vehicle::where($where)->count();
|
||||||
|
}
|
||||||
$result = ['list' => $vehicles,'count'=>$count];
|
$result = ['list' => $vehicles,'count'=>$count];
|
||||||
return Util::success($result);
|
return Util::success($result);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user