|
@@ -226,23 +226,28 @@ class AdsController extends BaseController |
|
@@ -226,23 +226,28 @@ class AdsController extends BaseController |
|
226
|
$task_id = intval($request->input('task_id'));
|
226
|
$task_id = intval($request->input('task_id'));
|
|
227
|
$domain = trim($request->input('domain'));
|
227
|
$domain = trim($request->input('domain'));
|
|
228
|
$company = trim($request->input('company'));
|
228
|
$company = trim($request->input('company'));
|
|
|
|
229
|
+ $operator = trim($request->input('operator'));
|
|
229
|
$num = trim($request->input('num'));
|
230
|
$num = trim($request->input('num'));
|
|
230
|
|
231
|
|
|
231
|
- $result = ReInquiryDetail::with('detailLog')
|
|
|
|
232
|
- ->when($status, function ($query, $status) {
|
|
|
|
233
|
- return $query->where('status', $status);
|
232
|
+ $result = ReInquiryCount::when($task_id, function ($query, $task_id) {
|
|
|
|
233
|
+ return $query->WhereRaw("FIND_IN_SET({$task_id}, `task_ids`)");
|
|
234
|
})
|
234
|
})
|
|
235
|
- ->when($form_id, function ($query, $form_id) {
|
|
|
|
236
|
- return $query->where('form_id', $form_id);
|
235
|
+ ->when($domain, function ($query, $domain) {
|
|
|
|
236
|
+ return $query->where('domain', 'like', '%'.$domain.'%');
|
|
237
|
})
|
237
|
})
|
|
238
|
- ->when($task_id, function ($query, $task_id) {
|
|
|
|
239
|
- return $query->where('task_id', $task_id);
|
238
|
+ ->when($company, function ($query, $company) {
|
|
|
|
239
|
+ return $query->where('company', 'like', '%'.$company.'%');
|
|
240
|
})
|
240
|
})
|
|
241
|
- ->when($country, function ($query, $country) {
|
|
|
|
242
|
- return $query->where('country', 'like', '%'.$country.'%');
|
241
|
+ ->when($num, function ($query) use($num, $operator) {
|
|
|
|
242
|
+ return $query->where('num', $operator?:'=', $num);
|
|
243
|
})
|
243
|
})
|
|
244
|
- ->orderBy('id', 'desc')
|
244
|
+ ->orderBy('num', 'desc')
|
|
245
|
->paginate();
|
245
|
->paginate();
|
|
|
|
246
|
+
|
|
|
|
247
|
+ foreach ($result as $item){
|
|
|
|
248
|
+ $item->tasks = $item->tasks; //调用访问器
|
|
|
|
249
|
+ }
|
|
|
|
250
|
+
|
|
246
|
return $this->response('success', Code::SUCCESS, $result);
|
251
|
return $this->response('success', Code::SUCCESS, $result);
|
|
247
|
}
|
252
|
}
|
|
248
|
} |
253
|
} |