From ed16866f1ec3a262bbb88a432161e313c1db91d9 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Wed, 26 Nov 2025 13:35:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/GateController.php | 9 ++++++--- app/Http/Controllers/Admin/VisitController.php | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/GateController.php b/app/Http/Controllers/Admin/GateController.php index d627791..f88cda2 100644 --- a/app/Http/Controllers/Admin/GateController.php +++ b/app/Http/Controllers/Admin/GateController.php @@ -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, '拜访记录不存在']); } diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 3f0ab36..b80c4ae 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -58,7 +58,7 @@ class VisitController extends CommonController $query->where('type', $all['type']); } if (isset($all['start_date'])) { - $query->where('date', '>=', isset($all['start_date'])); + $query->where('date', '>=', $all['start_date']); } if (isset($all['end_date'])) { $query->where('date', '<=', $all['end_date']);