|
|
@@ -49,14 +49,14 @@ class OrderShift extends Base
|
|
|
$limit = $this->request->param('limit',10);
|
|
|
$off_set = $this->request->param('offset',0);
|
|
|
$total = $this->model->where(function ($query)use ($filter){
|
|
|
- // if (isset($filter['createtime']))$query->where('create_at', 'between time', explode(' - ',$filter['createtime']));
|
|
|
+ if (isset($filter['createtime']))$query->where('create_at', 'between time', explode(' - ',$filter['createtime']));
|
|
|
if (isset($filter['sh_status']))$query->where('sh_status', '=', $filter['sh_status']);
|
|
|
if (isset($filter['user_id']))$query->where('user_id', '=', $filter['user_id']);
|
|
|
if (isset($filter['order_no']))$query->where('order_no', 'like', '%'.$filter['order_no'].'%');
|
|
|
})->count();
|
|
|
$list= $this->model->with('user')
|
|
|
->where(function ($query)use ($filter){
|
|
|
- //if (isset($filter['createtime']))$query->where('create_at', 'between time', explode(' - ',$filter['createtime']));
|
|
|
+ if (isset($filter['createtime']))$query->where('create_at', 'between time', explode(' - ',$filter['createtime']));
|
|
|
if (isset($filter['sh_status']))$query->where('sh_status', '=', $filter['sh_status']);
|
|
|
if (isset($filter['user_id']))$query->where('user_id', '=', $filter['user_id']);
|
|
|
if (isset($filter['order_no']))$query->where('order_no', 'like', '%'.$filter['order_no'].'%');
|
