update

app/Models/CourseSign.php

@@ -232,19 +232,10 @@ class CourseSign extends SoftDeletesModel
      */
     public static function area($start_date, $end_date, $status = null, $course_ids = null, $retList = false)
     {
-        // 获取所有学员id
+
-        $courseSignList = CourseSign::where(function ($query) use ($status, $course_ids) {
+        $courseSignsQuery = self::getStudentList($start_date, $end_date, $status, $course_ids);
-            if (isset($status)) {
+        $courseSignList = $courseSignsQuery->get();
-                $query->where('status', $status);
+
-            }
-            if (isset($course_ids)) {
-                $query->whereIn('course_id', $course_ids);
-            }
-        })->whereHas('course', function ($query) use ($start_date, $end_date) {
-            // 开始结束日期的筛选。or查询
-            $query->whereBetween('start_date', [$start_date, $end_date])
-                ->orWhereBetween('end_date', [$start_date, $end_date]);
-        })->whereHas('user')->whereNotIn('status', [4, 5]);
         // 地区
         $suzhouArea = Company::where('company_city', '苏州市')->pluck('company_area')->unique();
         $list = [];