master
cody 3 months ago
parent b7bad4c037
commit acd1653e6e

@ -289,12 +289,20 @@ class UserController extends BaseController
if (isset($all['course_name'])) { if (isset($all['course_name'])) {
$q->where('name', 'like', '%' . $all['course_name'] . '%'); $q->where('name', 'like', '%' . $all['course_name'] . '%');
} }
if (isset($all['courses_start_date'])) { // 课程日期与统计一致start_date 或 end_date 在区间内即计入whereBetween 重叠逻辑)
if (!empty($all['courses_start_date']) && !empty($all['courses_end_date'])) {
$q->where(function ($query) use ($all) {
$query->whereBetween('start_date', [$all['courses_start_date'], $all['courses_end_date']])
->orWhereBetween('end_date', [$all['courses_start_date'], $all['courses_end_date']]);
});
} else {
if (!empty($all['courses_start_date'])) {
$q->where('start_date', '>=', $all['courses_start_date']); $q->where('start_date', '>=', $all['courses_start_date']);
} }
if (isset($all['courses_end_date'])) { if (!empty($all['courses_end_date'])) {
$q->where('end_date', '<=', $all['courses_end_date']); $q->where('end_date', '<=', $all['courses_end_date']);
} }
}
if (isset($all['courses_ing']) && $all['courses_ing'] == 1) { if (isset($all['courses_ing']) && $all['courses_ing'] == 1) {
$q->where(function ($query) use ($all) { $q->where(function ($query) use ($all) {
$query->where('start_date', '<=', date('Y-m-d'))->where('end_date', '>=', date('Y-m-d')); $query->where('start_date', '<=', date('Y-m-d'))->where('end_date', '>=', date('Y-m-d'));

Loading…
Cancel
Save