|
|
@@ -53,27 +53,27 @@ class ServiceWorkLists extends BaseAdminDataLists implements ListsSearchInterfac
|
|
|
$master_worker_ids = MasterWorker::where([['nickname|worker_number|mobile', 'like','%' .$this->params['master_worker_name'] . '%']])->column('id')??[0];
|
|
|
$where[] = ['master_worker_id','in' ,$master_worker_ids];
|
|
|
}
|
|
|
- if(isset($this->params['dispatch_time']) && !empty($this->params['dispatch_time'])){
|
|
|
+ if(isset($this->params['dispatch_time']) && !empty($this->params['dispatch_time'][0]) && !empty($this->params['dispatch_time'][1])){
|
|
|
$time = [strtotime($this->params['dispatch_time'][0]), strtotime($this->params['dispatch_time'][1])];
|
|
|
$where[] = ['dispatch_time', 'between', $time];
|
|
|
}
|
|
|
- if(isset($this->params['receive_time']) && !empty($this->params['receive_time'])){
|
|
|
+ if(isset($this->params['receive_time']) && !empty($this->params['receive_time'][0]) && !empty($this->params['receive_time'][1])){
|
|
|
$time = [strtotime($this->params['receive_time'][0]), strtotime($this->params['receive_time'][1])];
|
|
|
$where[] = ['receive_time', 'between', $time];
|
|
|
}
|
|
|
- if(isset($this->params['appointment_time']) && !empty($this->params['appointment_time'])){
|
|
|
+ if(isset($this->params['appointment_time']) && !empty($this->params['appointment_time'][0]) && !empty($this->params['appointment_time'][1])){
|
|
|
$time = [strtotime($this->params['appointment_time'][0]), strtotime($this->params['appointment_time'][1])];
|
|
|
$where[] = ['appointment_time', 'between', $time];
|
|
|
}
|
|
|
- if(isset($this->params['finished_time']) && !empty($this->params['finished_time'])){
|
|
|
+ if(isset($this->params['finished_time']) && !empty($this->params['finished_time'][0]) && !empty($this->params['finished_time'][1])){
|
|
|
$time = [strtotime($this->params['finished_time'][0]), strtotime($this->params['finished_time'][1])];
|
|
|
$where[] = ['finished_time', 'between', $time];
|
|
|
}
|
|
|
- if(isset($this->params['create_time']) && !empty($this->params['create_time'])){
|
|
|
+ if(isset($this->params['create_time']) && !empty($this->params['create_time'][0]) && !empty($this->params['create_time'][1])){
|
|
|
$time = [strtotime($this->params['create_time'][0]), strtotime($this->params['create_time'][1])];
|
|
|
$where[] = ['create_time', 'between', $time];
|
|
|
}
|
|
|
- if(isset($this->params['update_time']) && !empty($this->params['update_time'])){
|
|
|
+ if(isset($this->params['update_time']) && !empty($this->params['update_time'][0]) && !empty($this->params['update_time'][1])){
|
|
|
$time = [strtotime($this->params['update_time'][0]), strtotime($this->params['update_time'][1])];
|
|
|
$where[] = ['update_time', 'between', $time];
|
|
|
}
|