|
|
|
@ -112,8 +112,8 @@ class WorkMainController extends Controller
|
|
|
|
$list=DB::table('s_list')
|
|
|
|
$list=DB::table('s_list')
|
|
|
|
->leftJoin('s_period','s_list.reservation_time','=','s_period.id')
|
|
|
|
->leftJoin('s_period','s_list.reservation_time','=','s_period.id')
|
|
|
|
->leftJoin('s_department_resources','s_list.reservation_sources','=','s_department_resources.id')
|
|
|
|
->leftJoin('s_department_resources','s_list.reservation_sources','=','s_department_resources.id')
|
|
|
|
->select('s_list.*','s_period.period_begin_time','s_period.period_end_time','s_department_resources.department_resources_name');
|
|
|
|
->select('s_list.*','s_period.period_begin_time','s_period.period_end_time','s_department_resources.department_resources_name')
|
|
|
|
|
|
|
|
->where(['s_list.is_del'=>0,'s_list.is_nullify'=>0]);
|
|
|
|
if($userInfo[0]->group==2){
|
|
|
|
if($userInfo[0]->group==2){
|
|
|
|
// $list=$list->whereIn('warddesc', explode(",", $userInfo[0]->ward));
|
|
|
|
// $list=$list->whereIn('warddesc', explode(",", $userInfo[0]->ward));
|
|
|
|
$list=$list->where(['wardcode'=> $department->department_number]);
|
|
|
|
$list=$list->where(['wardcode'=> $department->department_number]);
|
|
|
|
@ -157,7 +157,7 @@ class WorkMainController extends Controller
|
|
|
|
|
|
|
|
|
|
|
|
$count = $list;
|
|
|
|
$count = $list;
|
|
|
|
$count = $count->count();
|
|
|
|
$count = $count->count();
|
|
|
|
$list=$list->where(['s_list.is_del'=>0,'s_list.is_nullify'=>0])->orderBy('id', 'desc')->limit($pageSize)->skip(($page - 1) * $pageSize) // 跳过前9999条记录
|
|
|
|
$list=$list->orderBy('id', 'desc')->limit($pageSize)->skip(($page - 1) * $pageSize) // 跳过前9999条记录
|
|
|
|
->take($pageSize)->get();
|
|
|
|
->take($pageSize)->get();
|
|
|
|
|
|
|
|
|
|
|
|
//匹配设备(服务组)
|
|
|
|
//匹配设备(服务组)
|
|
|
|
|