master
cody 6 months ago
parent 7dfcbff291
commit 271ce97959

@ -50,7 +50,7 @@ class CourseContentController extends BaseController
{ {
$all = request()->all(); $all = request()->all();
$list = $this->model->with($all['show_relation'] ?? []) $list = $this->model->with($all['show_relation'] ?? [])
->withCount('courseKeeps', 'courseContentEvaluationForms', 'courseContentEvaluationAsks') ->withCount('courseKeeps', 'courseContentEvaluationForms', 'courseContentEvaluation.courseContentEvaluationAsks')
->withCount(['courseKeeps as user_sign_total' => function ($query) { ->withCount(['courseKeeps as user_sign_total' => function ($query) {
$query->where('status', 1); $query->where('status', 1);
}])->withCount(['courseKeeps as user_lack_sign_total' => function ($query) { }])->withCount(['courseKeeps as user_lack_sign_total' => function ($query) {
@ -129,7 +129,7 @@ class CourseContentController extends BaseController
if ($validator->fails()) { if ($validator->fails()) {
return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
} }
$detail = $this->model->with('courseContentEvaluationAsks', 'courseContentEvaluationForms')->find($all['id']); $detail = $this->model->with('courseContentEvaluation.courseContentEvaluationAsks', 'courseContentEvaluationForms')->find($all['id']);
return $this->success($detail); return $this->success($detail);
} }

@ -280,7 +280,7 @@ class CourseController extends CommonController
if ($validator->fails()) { if ($validator->fails()) {
return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
} }
$detail = CourseContent::with(['course', 'teacher', 'courseKeeps', 'courseContentEvaluationAsks' => function ($query) { $detail = CourseContent::with(['course', 'teacher', 'courseKeeps', 'courseContentEvaluation.courseContentEvaluationAsks' => function ($query) {
$query->orderBy('sort'); $query->orderBy('sort');
}])->find($all['course_content_id']); }])->find($all['course_content_id']);
return $this->success($detail); return $this->success($detail);

@ -46,9 +46,9 @@ class CourseContent extends SoftDeletesModel
return $this->hasMany(CourseSign::class, 'course_id', 'course_id'); return $this->hasMany(CourseSign::class, 'course_id', 'course_id');
} }
public function courseContentEvaluationAsks() public function courseContentEvaluation()
{ {
return $this->hasMany(CourseContentEvaluationAsk::class, 'course_content_id', 'id'); return $this->hasOne(CourseContentEvaluation::class, 'course_content_id', 'id');
} }
public function courseContentEvaluationForms() public function courseContentEvaluationForms()

@ -4,5 +4,9 @@ namespace App\Models;
class CourseContentEvaluation extends SoftDeletesModel class CourseContentEvaluation extends SoftDeletesModel
{ {
public function courseContentEvaluationAsks()
{
return $this->hasMany(CourseContentEvaluationAsk::class, 'course_content_evaluation_id', 'id');
}
} }

Loading…
Cancel
Save