|
|
|
|
@ -64,7 +64,7 @@ class CourseSignController extends BaseController
|
|
|
|
|
* @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="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="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\Response(
|
|
|
|
|
* response="200",
|
|
|
|
|
@ -75,12 +75,13 @@ class CourseSignController extends BaseController
|
|
|
|
|
public function index()
|
|
|
|
|
{
|
|
|
|
|
$all = request()->all();
|
|
|
|
|
$list = $this->model->with(['course.typeDetail', 'user' => function ($query) use ($all) {
|
|
|
|
|
// if (isset($all['clear']) && empty($all['clear'])) {
|
|
|
|
|
$clear = request('clear', 1);
|
|
|
|
|
$list = $this->model->with(['course.typeDetail', 'user' => function ($query) use ($all, $clear) {
|
|
|
|
|
if ($clear) {
|
|
|
|
|
$query->with(['courseSigns' => function ($q) {
|
|
|
|
|
$q->where('status', 1)->with('course');
|
|
|
|
|
}]);
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
}])->whereHas('user', function ($query) use ($all) {
|
|
|
|
|
if (isset($all['is_vip'])) {
|
|
|
|
|
$query->where('is_vip', $all['is_vip']);
|
|
|
|
|
@ -131,10 +132,10 @@ class CourseSignController extends BaseController
|
|
|
|
|
$query->whereJsonContains("data->{$item->name}", $item->value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})->where(function ($query) use ($all) {
|
|
|
|
|
// if (isset($all['clear']) && empty($all['clear'])) {
|
|
|
|
|
})->where(function ($query) use ($all, $clear) {
|
|
|
|
|
if ($clear) {
|
|
|
|
|
$query->with('thirdAppointmentLogs');
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
if (isset($all['start_date'])) {
|
|
|
|
|
$query->whereDate('created_at', '>=', $all['start_date']);
|
|
|
|
|
}
|
|
|
|
|
|