master
cody 9 months ago
parent da7e801dc9
commit 974f346525

@ -85,8 +85,8 @@ class GateController extends CommonController
} }
if (isset($all['start_date']) && isset($all['end_date'])) { if (isset($all['start_date']) && isset($all['end_date'])) {
$query->where(function ($q) use ($all) { $query->where(function ($q) use ($all) {
$q->whereBetween('visit_time', [$all['start_date'], $all['end_date']]) $q->whereBetween('start_date', [$all['start_date'], $all['end_date']])
->orWhereBetween('visit_time', [$all['start_date'], $all['end_date']]); ->orWhereBetween('end_date', [$all['start_date'], $all['end_date']]);
}); });
} }
})->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc')->paginate($all['page_size'] ?? 20);; })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc')->paginate($all['page_size'] ?? 20);;

@ -59,8 +59,8 @@ class VisitController extends CommonController
} }
if (isset($all['start_date']) && isset($all['end_date'])) { if (isset($all['start_date']) && isset($all['end_date'])) {
$query->where(function ($q) use ($all) { $query->where(function ($q) use ($all) {
$q->whereBetween('visit_time', [$all['start_date'], $all['end_date']]) $q->whereBetween('start_date', [$all['start_date'], $all['end_date']])
->orWhereBetween('visit_time', [$all['start_date'], $all['end_date']]); ->orWhereBetween('end_date', [$all['start_date'], $all['end_date']]);
}); });
} }
if (isset($all['my_self']) && !empty($all['my_self'])) { if (isset($all['my_self']) && !empty($all['my_self'])) {

@ -171,8 +171,8 @@ class Visit extends SoftDeletesModel
} }
if ($startDate && $endDate) { if ($startDate && $endDate) {
$query->where(function ($q) use ($startDate, $endDate) { $query->where(function ($q) use ($startDate, $endDate) {
$q->whereBetween('visit_time', [$startDate, $endDate]) $q->whereBetween('start_date', [$startDate, $endDate])
->orWhereBetween('visit_time', [$startDate, $endDate]); ->orWhereBetween('end_date', [$startDate, $endDate]);
}); });
} }
})->get(); })->get();

Loading…
Cancel
Save