|
|
@@ -932,6 +932,7 @@ class U8XkyServerService extends Service
|
|
|
if(! empty($data['id'])) $model->where('v.id', $data['id']);
|
|
|
if(! empty($data['order_number'])) $model->where('v.order_number', 'like', '%' . $data['order_number'] . '%');
|
|
|
if(! empty($data['order_time'])) $model->where('v.order_time', $data['order_time']);
|
|
|
+ if(! empty($data['crt_id'])) $model->where('v.crt_id', $data['crt_id']);
|
|
|
if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
|
|
|
$return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
|
|
|
$model->where('v.crt_time', '>=', $return[0]);
|
|
|
@@ -1308,6 +1309,7 @@ class U8XkyServerService extends Service
|
|
|
$model->where('v.crt_time', '>=', $return[0]);
|
|
|
$model->where('v.crt_time', '<=', $return[1]);
|
|
|
}
|
|
|
+ if(! empty($data['crt_id'])) $model->where('v.crt_id', $data['crt_id']);
|
|
|
|
|
|
return $model;
|
|
|
}
|
|
|
@@ -1684,6 +1686,7 @@ class U8XkyServerService extends Service
|
|
|
$model->where('v.crt_time', '>=', $return[0]);
|
|
|
$model->where('v.crt_time', '<=', $return[1]);
|
|
|
}
|
|
|
+ if(! empty($data['crt_id'])) $model->where('v.crt_id', $data['crt_id']);
|
|
|
|
|
|
return $model;
|
|
|
}
|