master
cody 9 months ago
parent 7b9bd2ce4c
commit 534497a9ef

@ -58,11 +58,11 @@ class VisitController extends CommonController
$query->where('type', $all['type']); $query->where('type', $all['type']);
} }
if (isset($all['start_date']) && isset($all['end_date'])) { if (isset($all['start_date']) && isset($all['end_date'])) {
$query->where(function ($q) use ($all) { // 查询日期范围与数据库日期范围有交集
$q->whereBetween('start_date', [$all['start_date'], $all['end_date']]) $query->where('start_date', '<=', $all['end_date'])
->orWhereBetween('end_date', [$all['start_date'], $all['end_date']]); ->where('end_date', '>=', $all['start_date']);
});
} }
if (isset($all['my_self']) && !empty($all['my_self'])) { if (isset($all['my_self']) && !empty($all['my_self'])) {
$query->where('admin_id', $this->getUserId()); $query->where('admin_id', $this->getUserId());
} }

@ -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('start_date', [$startDate, $endDate]) $q->where('start_date', '<=', $endDate)
->orWhereBetween('end_date', [$startDate, $endDate]); ->where('end_date', '>=', $startDate);
}); });
} }
})->get(); })->get();

Loading…
Cancel
Save