master
cody 3 months ago
parent 1235cce3ff
commit 4fd825f37a

@ -64,6 +64,7 @@ class CourseSignController extends BaseController
* @OA\Parameter(name="start_date", in="query", @OA\Schema(type="string"), required=true, description="开始日期"), * @OA\Parameter(name="start_date", in="query", @OA\Schema(type="string"), required=true, description="开始日期"),
* @OA\Parameter(name="end_date", in="query", @OA\Schema(type="string"), required=true, description="结束日期"), * @OA\Parameter(name="end_date", in="query", @OA\Schema(type="string"), required=true, description="结束日期"),
* @OA\Parameter(name="course_type_id", in="query", @OA\Schema(type="string"), required=true, description="课程体系id多个英文逗号"), * @OA\Parameter(name="course_type_id", in="query", @OA\Schema(type="string"), required=true, description="课程体系id多个英文逗号"),
* @OA\Parameter(name="clear", in="query", @OA\Schema(type="string"), required=true, description="是否简介模式0否1是"),
* @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
* @OA\Response( * @OA\Response(
* response="200", * response="200",
@ -75,11 +76,11 @@ class CourseSignController extends BaseController
{ {
$all = request()->all(); $all = request()->all();
$list = $this->model->with(['course.typeDetail', 'user' => function ($query) use ($all) { $list = $this->model->with(['course.typeDetail', 'user' => function ($query) use ($all) {
if (isset($all['clear']) && empty($all['clear'])) { // if (isset($all['clear']) && empty($all['clear'])) {
$query->with(['courseSigns' => function ($q) { $query->with(['courseSigns' => function ($q) {
$q->where('status', 1)->with('course'); $q->where('status', 1)->with('course');
}]); }]);
} // }
}])->whereHas('user', function ($query) use ($all) { }])->whereHas('user', function ($query) use ($all) {
if (isset($all['is_vip'])) { if (isset($all['is_vip'])) {
$query->where('is_vip', $all['is_vip']); $query->where('is_vip', $all['is_vip']);
@ -131,9 +132,9 @@ class CourseSignController extends BaseController
} }
} }
})->where(function ($query) use ($all) { })->where(function ($query) use ($all) {
if (isset($all['clear']) && empty($all['clear'])) { // if (isset($all['clear']) && empty($all['clear'])) {
$query->with('thirdAppointmentLogs'); $query->with('thirdAppointmentLogs');
} // }
if (isset($all['start_date'])) { if (isset($all['start_date'])) {
$query->whereDate('created_at', '>=', $all['start_date']); $query->whereDate('created_at', '>=', $all['start_date']);
} }

Loading…
Cancel
Save