Merge branch 'master' of ssh://47.101.48.251:/data/git/wx.sstbc.com

app/Http/Controllers/Admin/CourseContentEvaluationsController.php

@@ -53,60 +53,60 @@ class CourseContentEvaluationsController extends BaseController
     public function index()
     {
         $all = request()->all();
-        $list = $this->model->with('course','courseContent')
-            ->withCount('courseContentEvaluationAsks','courseContentEvaluationForms')
+        $list = $this->model->with('course')
+            ->withCount('courseContentEvaluationAsks', 'courseContentEvaluationForms')
             ->where(function ($query) use ($all) {
-            if (isset($all['filter']) && !empty($all['filter'])) {
-                foreach ($all['filter'] as $condition) {
-                    $key = $condition['key'] ?? null;
-                    $op = $condition['op'] ?? null;
-                    $value = $condition['value'] ?? null;
-                    if (!isset($key) || !isset($op) || !isset($value)) {
-                        continue;
-                    }
-                    // 等于
-                    if ($op == 'eq') {
-                        $query->where($key, $value);
-                    }
-                    // 不等于
-                    if ($op == 'neq') {
-                        $query->where($key, '!=', $value);
-                    }
-                    // 大于
-                    if ($op == 'gt') {
-                        $query->where($key, '>', $value);
-                    }
-                    // 大于等于
-                    if ($op == 'egt') {
-                        $query->where($key, '>=', $value);
-                    }
-                    // 小于
-                    if ($op == 'lt') {
-                        $query->where($key, '<', $value);
-                    }
-                    // 小于等于
-                    if ($op == 'elt') {
-                        $query->where($key, '<=', $value);
-                    }
-                    // 模糊搜索
-                    if ($op == 'like') {
-                        $query->where($key, 'like', '%' . $value . '%');
-                    }
-                    // 否定模糊搜索
-                    if ($op == 'notlike') {
-                        $query->where($key, 'not like', '%' . $value . '%');
-                    }
-                    // 范围搜索
-                    if ($op == 'range') {
-                        list($from, $to) = explode(',', $value);
-                        if (empty($from) || empty($to)) {
+                if (isset($all['filter']) && !empty($all['filter'])) {
+                    foreach ($all['filter'] as $condition) {
+                        $key = $condition['key'] ?? null;
+                        $op = $condition['op'] ?? null;
+                        $value = $condition['value'] ?? null;
+                        if (!isset($key) || !isset($op) || !isset($value)) {
                             continue;
                         }
-                        $query->whereBetween($key, [$from, $to]);
+                        // 等于
+                        if ($op == 'eq') {
+                            $query->where($key, $value);
+                        }
+                        // 不等于
+                        if ($op == 'neq') {
+                            $query->where($key, '!=', $value);
+                        }
+                        // 大于
+                        if ($op == 'gt') {
+                            $query->where($key, '>', $value);
+                        }
+                        // 大于等于
+                        if ($op == 'egt') {
+                            $query->where($key, '>=', $value);
+                        }
+                        // 小于
+                        if ($op == 'lt') {
+                            $query->where($key, '<', $value);
+                        }
+                        // 小于等于
+                        if ($op == 'elt') {
+                            $query->where($key, '<=', $value);
+                        }
+                        // 模糊搜索
+                        if ($op == 'like') {
+                            $query->where($key, 'like', '%' . $value . '%');
+                        }
+                        // 否定模糊搜索
+                        if ($op == 'notlike') {
+                            $query->where($key, 'not like', '%' . $value . '%');
+                        }
+                        // 范围搜索
+                        if ($op == 'range') {
+                            list($from, $to) = explode(',', $value);
+                            if (empty($from) || empty($to)) {
+                                continue;
+                            }
+                            $query->whereBetween($key, [$from, $to]);
+                        }
                     }
                 }
-            }
-        })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc');
+            })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc');
         if (isset($all['is_export']) && !empty($all['is_export'])) {
             $list = $list->get()->toArray();
             $export_fields = $all['export_fields'] ?? [];
@@ -148,7 +148,7 @@ class CourseContentEvaluationsController extends BaseController
         if ($validator->fails()) {
             return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
         }
-        $detail = $this->model->with('course','courseContent')->find($all['id']);
+        $detail = $this->model->with('course')->find($all['id']);
         return $this->success($detail);
     }
 
@@ -160,7 +160,7 @@ class CourseContentEvaluationsController extends BaseController
      *     description="",
      *     @OA\Parameter(name="id", in="query", @OA\Schema(type="integer", format="int64"), required=true, description="课程内容评价字段ID（存在则更新，不存在则新增）"),
      *     @OA\Parameter(name="course_id", in="query", @OA\Schema(type="integer"), required=false, description="课程ID"),
-     *     @OA\Parameter(name="course_content_id", in="query", @OA\Schema(type="integer"), required=false, description="课程内容ID"),
+     *     @OA\Parameter(name="course_content_id", in="query", @OA\Schema(type="integer"), required=false, description="课程内容ID,多个英文逗号分割"),
      *     @OA\Parameter(name="title", in="query", @OA\Schema(type="string", maxLength=255), required=false, description="问卷标题"),
      *     @OA\Parameter(name="desc", in="query", @OA\Schema(type="string", maxLength=255), required=false, description="问卷描述"),
      *     @OA\Parameter(name="type_id", in="query", @OA\Schema(type="string", maxLength=255), required=false, description="问卷类型ID"),

app/Http/Controllers/Mobile/CourseController.php

@@ -109,13 +109,47 @@ class CourseController extends CommonController
         if ($validator->fails()) {
             return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
         }
-        $detail = Course::with('qunImage', 'typeDetail', 'courseForms', 'teacher','courseContentEvaluation.courseContentEvaluationAsks')
-            ->withCount(['courseSigns as my_user' => function ($query) {
-                $query->where('user_id', $this->getUserId());
-            }])->find($all['course_id']);
+        $detail = Course::with(['qunImage', 'typeDetail', 'courseForms', 'teacher', 'courseContentEvaluation' => function ($query) {
+            $query->with(['courseContentEvaluationAsks' => function ($q) {
+                $q->orderBy('sort', 'asc');
+            }]);
+        }])->withCount(['courseSigns as my_user' => function ($query) {
+            $query->where('user_id', $this->getUserId());
+        }])->find($all['course_id']);
+        return $this->success($detail);
+    }
+
+    /**
+     * @OA\Get(
+     *     path="/api/mobile/course/evaluation-detail",
+     *     tags={"小程序-课程"},
+     *     summary="课程详情",
+     *     @OA\Parameter(name="course_content_evaluation_id", in="query", @OA\Schema(type="string"), required=false, description="问卷id"),
+     *     @OA\Response(
+     *         response=200,
+     *         description="操作成功"
+     *     )
+     * )
+     */
+    public function evaluationDetail()
+    {
+        $all = \request()->all();
+        $messages = [
+            'course_content_evaluation_id.required' => '问卷id必填',
+        ];
+        $validator = Validator::make($all, [
+            'course_content_evaluation_id' => 'required'
+        ], $messages);
+        if ($validator->fails()) {
+            return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
+        }
+        $detail = CourseContentEvaluation::with(['courseContentEvaluationAsks' => function ($q) {
+            $q->orderBy('sort', 'asc');
+        }])->find($all['course_content_evaluation_id']);
         return $this->success($detail);
     }
 
+
     /**
      * @OA\Get(
      *     path="/api/mobile/course/course-detail-pc",

app/Models/Course.php

@@ -101,7 +101,7 @@ class Course extends SoftDeletesModel
 
     public function courseContentEvaluation()
     {
-        return $this->hasOne(CourseContentEvaluation::class, 'course_id', 'id');
+        return $this->hasMany(CourseContentEvaluation::class, 'course_id', 'id');
     }
 
     /**

app/Models/CourseContent.php

@@ -60,6 +60,11 @@ class CourseContent extends SoftDeletesModel
         return $this->hasOne(CourseContentEvaluation::class, 'course_content_id', 'id');
     }
 
+    public function courseContentEvaluationAsks()
+    {
+        return $this->hasMany(CourseContentEvaluationAsk::class, 'course_content_id', 'id');
+    }
+
     public function directionDetail()
     {
         return $this->hasOne(ParameterDetail::class, 'id', 'direction');

app/Models/CourseContentEvaluation.php

@@ -4,15 +4,20 @@ namespace App\Models;
 
 class CourseContentEvaluation extends SoftDeletesModel
 {
+    protected $appends = ['course_content'];
 
-    public function course()
+    public function getCourseContentAttribute()
     {
-        return $this->belongsTo(Course::class, 'course_id', 'id');
+        if (empty($this->course_content_id)) {
+            return [];
+        }
+        $course_content_id = explode(',', $this->course_content_id);
+        return CourseContent::whereIn('id', $course_content_id)->get();
     }
 
-    public function courseContent()
+    public function course()
     {
-        return $this->belongsTo(CourseContent::class, 'course_content_id', 'id');
+        return $this->belongsTo(Course::class, 'course_id', 'id');
     }
 
     public function courseContentEvaluationAsks()
@@ -20,7 +25,8 @@ class CourseContentEvaluation extends SoftDeletesModel
         return $this->hasMany(CourseContentEvaluationAsk::class, 'course_content_evaluation_id', 'id');
     }
 
-    public function courseContentEvaluationForms(){
+    public function courseContentEvaluationForms()
+    {
         return $this->hasMany(CourseContentEvaluationForm::class, 'course_content_evaluation_id', 'id');
     }
 

routes/api.php

@@ -273,6 +273,8 @@ Route::group(["namespace" => "Mobile", "prefix" => "mobile"], function () {
 
         // 课程信息
         Route::get('course/course-detail', [\App\Http\Controllers\Mobile\CourseController::class, "courseDetail"]);
+        Route::get('course/evaluation-detail', [\App\Http\Controllers\Mobile\CourseController::class, "evaluationDetail"]);
+
         Route::post('course/sign', [\App\Http\Controllers\Mobile\CourseController::class, "sign"]);
         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"]);