|
|
@@ -220,6 +220,7 @@ class CustomerSupplyService extends Service
|
|
|
if(! empty($data['type'])) $model->where('type', $data['type']);
|
|
|
if(! empty($data['id'])) $model->whereIn('id', $data['id']);
|
|
|
if(! empty($data['crt_id'])) $model->whereIn('crt_id', $data['crt_id']);
|
|
|
+ if(! empty($data['status'])) $model->where('status', $data['status']);
|
|
|
if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
|
|
|
$return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
|
|
|
$model->where('crt_time','>=',$return[0]);
|
|
|
@@ -250,6 +251,7 @@ class CustomerSupplyService extends Service
|
|
|
|
|
|
public function countStatus($data, $user)
|
|
|
{
|
|
|
+ if(isset($data['status'])) unset($data['status']);
|
|
|
$model = $this->customerSupplyCommon($data, $user);
|
|
|
|
|
|
// 统计各状态
|