diff --git a/app/Http/Controllers/Admin/CourseContentCheckController.php b/app/Http/Controllers/Admin/CourseContentCheckController.php index ddbcf1c..0636a2a 100644 --- a/app/Http/Controllers/Admin/CourseContentCheckController.php +++ b/app/Http/Controllers/Admin/CourseContentCheckController.php @@ -64,6 +64,10 @@ class CourseContentCheckController extends BaseController public function index() { $all = request()->all(); + $course = Course::find($all['course_id']); + if ($course->is_arrange == 0 && isset($all['course_content_id'])) { + unset($all['course_content_id']); + } // 签到用户 $courseContentCheck = CourseContentCheck::where(function ($query) use ($all) { if (isset($all['course_id'])) { @@ -73,6 +77,12 @@ class CourseContentCheckController extends BaseController $query->where('course_content_id', $all['course_content_id']); } })->get(); + $total = CourseSign::where(function ($query) use ($all) { + $query->where('status', 1); + if (isset($all['course_id'])) { + $query->where('course_id', $all['course_id']); + } + })->count(); $list = CourseSign::with(['course.typeDetail', 'user'])->whereHas('user', function ($query) use ($all) { if (isset($all['name'])) { @@ -82,6 +92,7 @@ class CourseContentCheckController extends BaseController $query->where('mobile', 'like', '%' . $all['mobile'] . '%'); } })->where(function ($query) use ($all, $courseContentCheck) { + $query->where('status', 1); if (isset($all['course_id'])) { $query->where('course_id', $all['course_id']); } @@ -165,7 +176,7 @@ class CourseContentCheckController extends BaseController })->first(); } } - return $this->success(['list' => $list, 'course_content_check_count' => $courseContentCheck->count()]); + return $this->success(['list' => $list, 'course_content_check_count' => $courseContentCheck->count(), 'total' => $total]); } /**