update

app/Http/Controllers/Admin/OtherController.php

@@ -571,16 +571,18 @@ class OtherController extends CommonController
 
                 foreach ($companies as $company) {
                     // 获取该公司在时间范围内的学员报名记录
-                    $courseSigns = CourseSign::whereHas('user', function ($query) use ($company) {
+                    $courseSigns = CourseSign::where(function ($query) use ($course_ids) {
-                        $query->where('company_id', $company->id);
+                        $query->where('status', 1);
-                    })->whereDate('created_at', '>=', $start_date)
+                        if (isset($course_ids)) {
-                        ->whereDate('created_at', '<=', $end_date)
+                            $query->whereIn('course_id', $course_ids);
-                        ->whereNotIn('status', [4, 5])
+                        }
-                        ->where(function ($query) use ($course_ids) {
+                    })->whereHas('course', function ($query) use ($start_date, $end_date) {
-                            if ($course_ids->isNotEmpty()) {
+                        // 开始结束日期的筛选。or查询
-                                $query->whereIn('course_id', $course_ids);
+                        if ($start_date && $end_date) {
-                            }
+                            $query->whereBetween('start_date', [$start_date, $end_date])
-                        })
+                                ->orWhereBetween('end_date', [$start_date, $end_date]);
+                        }
+                    })->whereNotIn('status', [4, 5, 6])
                         ->with(['user', 'course.typeDetail'])
                         ->get();