master
cody 2 weeks ago
parent 20f7cbc239
commit 5a1ca8359f

@ -400,6 +400,8 @@ class OtherController extends CommonController
case 'course_signs_pass': case 'course_signs_pass':
// 审核通过人数明细 - 使用courseSignsTotal方法获取列表与coursesHome算法一致 // 审核通过人数明细 - 使用courseSignsTotal方法获取列表与coursesHome算法一致
$courseSigns = CourseSign::courseSignsTotal($start_date, $end_date, 1, $course_ids, null, true); $courseSigns = CourseSign::courseSignsTotal($start_date, $end_date, 1, $course_ids, null, true);
// 加载关联关系
$courseSigns->load(['user', 'course']);
foreach ($courseSigns as $sign) { foreach ($courseSigns as $sign) {
$data[] = [ $data[] = [

@ -79,21 +79,20 @@ class CourseSign extends SoftDeletesModel
*/ */
public static function getStudentList($start_date = null, $end_date = null, $status = null, $course_ids = null) public static function getStudentList($start_date = null, $end_date = null, $status = null, $course_ids = null)
{ {
$baseQuery = CourseSign::with('user', 'course') $baseQuery = CourseSign::where(function ($query) use ($course_ids, $status) {
->where(function ($query) use ($course_ids, $status) { if ($status) {
if ($status) { $query->where('status', $status);
$query->where('status', $status); }
} if (isset($course_ids)) {
if (isset($course_ids)) { $query->whereIn('course_id', $course_ids);
$query->whereIn('course_id', $course_ids); }
} })->whereHas('course', function ($query) use ($start_date, $end_date) {
})->whereHas('course', function ($query) use ($start_date, $end_date) { // 开始结束日期的筛选。or查询
// 开始结束日期的筛选。or查询 if ($start_date && $end_date) {
if ($start_date && $end_date) { $query->whereBetween('start_date', [$start_date, $end_date])
$query->whereBetween('start_date', [$start_date, $end_date]) ->orWhereBetween('end_date', [$start_date, $end_date]);
->orWhereBetween('end_date', [$start_date, $end_date]); }
} })->whereNotIn('status', [4, 5, 6]);
})->whereNotIn('status', [4, 5, 6]);
return $baseQuery; return $baseQuery;
} }

Loading…
Cancel
Save