master
cody 2 months ago
parent 1307eeefa3
commit 9cf34f8b90

@ -223,7 +223,7 @@ class CourseController extends CommonController
*/ */
public function myCourse() public function myCourse()
{ {
$list = Course::with('typeDetail','courseContentEvaluation')->with(['courseSigns' => function ($query) { $list = Course::with('typeDetail', 'courseContentEvaluation')->with(['courseSigns' => function ($query) {
$query->where('user_id', $this->getUserId()); $query->where('user_id', $this->getUserId());
}])->whereHas('courseSigns', function ($query) { }])->whereHas('courseSigns', function ($query) {
$query->where('user_id', $this->getUserId()); $query->where('user_id', $this->getUserId());
@ -652,6 +652,7 @@ class CourseController extends CommonController
* path="/api/mobile/course/content-check-list", * path="/api/mobile/course/content-check-list",
* tags={"小程序-课程"}, * tags={"小程序-课程"},
* summary="获取签到记录", * summary="获取签到记录",
* @OA\Parameter(name="course_id", in="query", @OA\Schema(type="string"), required=false, description="课程id"),
* @OA\Parameter(name="course_content_id", in="query", @OA\Schema(type="string"), required=false, description="课表id"), * @OA\Parameter(name="course_content_id", in="query", @OA\Schema(type="string"), required=false, description="课表id"),
* @OA\Response( * @OA\Response(
* response=200, * response=200,
@ -662,18 +663,14 @@ class CourseController extends CommonController
public function contentCheckList() public function contentCheckList()
{ {
$all = \request()->all(); $all = \request()->all();
$messages = [ $list = CourseContentCheck::where(function ($query) use ($all) {
'course_content_id.required' => '课程id必填', if (isset($all['course_id'])) {
]; $query->where('course_id', $all['course_id']);
$validator = Validator::make($all, [ }
'course_content_id' => 'required' if (isset($all['course_content_id'])) {
], $messages); $query->where('course_content_id', $all['course_content_id']);
if ($validator->fails()) { }
return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); })->where('user_id', $this->getUserId())
}
$list = CourseContentCheck::where('course_content_id', $all['course_content_id'])
->where('user_id', $this->getUserId())
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->get(); ->get();
return $this->success(compact('list')); return $this->success(compact('list'));

Loading…
Cancel
Save