master
cody 4 months ago
parent 71cb91170f
commit 3e69f77e61

@ -206,12 +206,6 @@ class CourseController extends BaseController
* @OA\Parameter(name="longitude", in="query", @OA\Schema(type="string"), description="经度"),
* @OA\Parameter(name="latitude", in="query", @OA\Schema(type="string"), description="纬度"),
* @OA\Parameter(name="address_detail", in="query", @OA\Schema(type="string"), description="详细地址"),
* @OA\Parameter(name="course_content_evaluation_title", in="query", @OA\Schema(type="integer"), description="问卷标题"),
* @OA\Parameter(name="course_content_status", in="query", @OA\Schema(type="integer"), description="课表状态0未发布, 1已发布"),
* @OA\Parameter(name="course_content_evaluation_desc", in="query", @OA\Schema(type="integer"), description="问卷描述"),
* @OA\Parameter(name="course_content_evaluation_type_id", in="query", @OA\Schema(type="integer"), description="问卷类型id"),
* @OA\Parameter(name="course_content_evaluation_start_time", in="query", @OA\Schema(type="integer"), description="问卷开始时间"),
* @OA\Parameter(name="course_content_evaluation_end_time", in="query", @OA\Schema(type="integer"), description="问卷结束时间"),
* @OA\Response(
* response=200,
* description="操作成功"

@ -223,7 +223,7 @@ class CourseController extends CommonController
*/
public function myCourse()
{
$list = Course::with('typeDetail')->with(['courseSigns' => function ($query) {
$list = Course::with('typeDetail','courseContentEvaluation')->with(['courseSigns' => function ($query) {
$query->where('user_id', $this->getUserId());
}])->whereHas('courseSigns', function ($query) {
$query->where('user_id', $this->getUserId());
@ -318,12 +318,10 @@ class CourseController extends CommonController
$messages = [
'course_content_evaluation_id.required' => '问卷id必填',
'data.required' => '表单数据必填',
// 'time_total.required' => '用时必填'
];
$validator = Validator::make($all, [
'course_content_evaluation_id' => 'required',
'data' => 'required',
// 'time_total' => 'required'
], $messages);
if ($validator->fails()) {
return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
@ -345,6 +343,7 @@ class CourseController extends CommonController
return $this->fail([ResponseCode::ERROR_BUSINESS, '您已提交过评价']);
}
$model = CourseContentEvaluationForm::create([
'course_id' => $courseContentEvaluation->course_id,
'course_content_evaluation_id' => $all['course_content_evaluation_id'],
'user_id' => $this->getUserId(),
'time_total' => $all['time_total'] ?? 0,

@ -99,6 +99,11 @@ class Course extends SoftDeletesModel
return $this->hasMany(CourseContent::class, 'course_id', 'id');
}
public function courseContentEvaluation()
{
return $this->hasOne(CourseContentEvaluation::class, 'course_id', 'id');
}
/**
* 更新课程报名状态
*/

@ -14,6 +14,8 @@ return new class extends Migration {
{
Schema::create('course_content_evaluation_forms', function (Blueprint $table) {
$table->id();
// 课程id
$table->integer('course_id')->nullable()->comment('课程id');
$table->integer('course_content_evaluation_id')->nullable()->comment('课程内容id');
$table->integer('user_id')->nullable()->comment('用户id');
$table->integer('time_total')->nullable()->comment('用时,单位秒');

@ -275,7 +275,7 @@ Route::group(["namespace" => "Mobile", "prefix" => "mobile"], function () {
Route::get('course/my-course', [\App\Http\Controllers\Mobile\CourseController::class, "myCourse"]);
Route::get('course/my-course-content', [\App\Http\Controllers\Mobile\CourseController::class, "myCourseContent"]);
Route::get('course/course-content-detail', [\App\Http\Controllers\Mobile\CourseController::class, "courseContentDetail"]);
Route::post('course/course-content-form', [\App\Http\Controllers\Mobile\CourseController::class, "courseContentForm"]);
Route::post('course/course-form', [\App\Http\Controllers\Mobile\CourseController::class, "courseForm"]);
Route::get('course/get-sign', [\App\Http\Controllers\Mobile\CourseController::class, "getSign"]);
Route::post('course/update-sign', [\App\Http\Controllers\Mobile\CourseController::class, "updateSign"]);
// 获取缴费二维码

Loading…
Cancel
Save