|
|
|
|
@ -83,8 +83,11 @@ class GateController extends CommonController
|
|
|
|
|
if (isset($all['idcard'])) {
|
|
|
|
|
$query->where('idcard', $all['idcard']);
|
|
|
|
|
}
|
|
|
|
|
if (isset($all['start_date']) && isset($all['end_date'])) {
|
|
|
|
|
$query->whereBetween('date', [$all['start_date'], $all['end_date']]);
|
|
|
|
|
if (isset($all['start_date'])) {
|
|
|
|
|
$query->where('date', '>=', $all['start_date']);
|
|
|
|
|
}
|
|
|
|
|
if (isset($all['end_date'])) {
|
|
|
|
|
$query->where('date', '<=', $all['end_date']);
|
|
|
|
|
}
|
|
|
|
|
})->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc')->paginate($all['page_size'] ?? 20);;
|
|
|
|
|
return $this->success($list);
|
|
|
|
|
@ -125,7 +128,7 @@ class GateController extends CommonController
|
|
|
|
|
$query->where('person_no', "{$all['code']}")
|
|
|
|
|
->orWhere('idcard', "{$all['code']}")
|
|
|
|
|
->orWhere('code', "{$all['code']}");
|
|
|
|
|
})->first();
|
|
|
|
|
})->first();
|
|
|
|
|
if (empty($check)) {
|
|
|
|
|
return $this->fail([ResponseCode::ERROR_BUSINESS, '拜访记录不存在']);
|
|
|
|
|
}
|
|
|
|
|
|