master
cody 3 months ago
parent 6fcabf78c3
commit 05ef1c0dba

@ -68,7 +68,6 @@ class CourseContentCheckController extends BaseController
'course.typeDetail', 'course.typeDetail',
'user', 'user',
'courseContentCheck' => function ($query) use ($all) { 'courseContentCheck' => function ($query) use ($all) {
$query->whereColumn('course_content_checks.user_id', 'course_signs.user_id');
if (isset($all['course_content_id'])) { if (isset($all['course_content_id'])) {
$query->where('course_content_id', $all['course_content_id']); $query->where('course_content_id', $all['course_content_id']);
} }
@ -123,14 +122,12 @@ class CourseContentCheckController extends BaseController
if (isset($all['has_check'])) { if (isset($all['has_check'])) {
if ($all['has_check'] == 1) { if ($all['has_check'] == 1) {
$list = $list->whereHas('courseContentCheck', function ($query) use ($all) { $list = $list->whereHas('courseContentCheck', function ($query) use ($all) {
$query->whereColumn('course_content_checks.user_id', 'course_signs.user_id');
if (isset($all['course_content_id'])) { if (isset($all['course_content_id'])) {
$query->where('course_content_id', $all['course_content_id']); $query->where('course_content_id', $all['course_content_id']);
} }
}); });
} else { } else {
$list = $list->whereDoesntHave('courseContentCheck', function ($query) use ($all) { $list = $list->whereDoesntHave('courseContentCheck', function ($query) use ($all) {
$query->whereColumn('course_content_checks.user_id', 'course_signs.user_id');
if (isset($all['course_content_id'])) { if (isset($all['course_content_id'])) {
$query->where('course_content_id', $all['course_content_id']); $query->where('course_content_id', $all['course_content_id']);
} }
@ -171,8 +168,8 @@ class CourseContentCheckController extends BaseController
* ) * )
*/ */
public public
function show() function show(
{ ) {
return parent::show(); return parent::show();
} }
@ -191,8 +188,8 @@ class CourseContentCheckController extends BaseController
* ) * )
*/ */
public public
function save() function save(
{ ) {
return parent::save(); return parent::save();
} }
@ -211,8 +208,8 @@ class CourseContentCheckController extends BaseController
* ) * )
*/ */
public public
function destroy() function destroy(
{ ) {
return parent::destroy(); return parent::destroy();
} }

@ -42,13 +42,15 @@ class CourseSign extends SoftDeletesModel
public function getFilesAttribute($value) public function getFilesAttribute($value)
{ {
if (empty($this->file_ids)) return []; if (empty($this->file_ids))
return [];
return Upload::whereIn('id', $this->file_ids)->get(); return Upload::whereIn('id', $this->file_ids)->get();
} }
public function getFeeFilesAttribute($value) public function getFeeFilesAttribute($value)
{ {
if (empty($this->fee_file_ids)) return []; if (empty($this->fee_file_ids))
return [];
return Upload::whereIn('id', $this->fee_file_ids)->get(); return Upload::whereIn('id', $this->fee_file_ids)->get();
} }
@ -59,7 +61,8 @@ class CourseSign extends SoftDeletesModel
public function courseContentCheck() public function courseContentCheck()
{ {
return $this->hasOne(CourseContentCheck::class, 'course_id', 'course_id'); return $this->hasOne(CourseContentCheck::class, 'course_id', 'course_id')
->whereColumn('course_content_checks.user_id', 'course_signs.user_id');
} }
public function user() public function user()

Loading…
Cancel
Save