|
|
@@ -604,8 +604,8 @@ class DispatchService extends Service
|
|
|
if(! empty($data['technology_material'])) $model->where('technology_material', 'LIKE', '%'.$data['technology_material'].'%');
|
|
|
if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) $model->whereBetween('crt_time',[$data['crt_time'][0],$data['crt_time'][1]]);
|
|
|
if(! empty($data['dispatch_time'][0]) && ! empty($data['dispatch_time'][1])){
|
|
|
- $model->where('dispatch_time_start','<=',$data['dispatch_time'][0]);
|
|
|
- $model->where('dispatch_time_end','>=',$data['dispatch_time'][1]);
|
|
|
+ $model->where('dispatch_time_start','>=',$data['dispatch_time'][0]);
|
|
|
+ $model->where('dispatch_time_end','<=',$data['dispatch_time'][1]);
|
|
|
}
|
|
|
if(! empty($data['team_id'])) $model->where('team_id',$data['team_id']);
|
|
|
if(! empty($data['device_id'])) $model->where('device_id',$data['device_id']);
|
cqp