|
|
|
|
@ -118,7 +118,7 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
$courseSignByType = CourseSign::whereHas('course', function ($query) use ($start_date, $end_date) {
|
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
|
$query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
->whereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
->orWhereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
})->whereHas('user', function ($query) use ($area) {
|
|
|
|
|
// if ($area) {
|
|
|
|
|
// if ($area == '苏州市外') {
|
|
|
|
|
@ -154,7 +154,7 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
$courseSignByType = CourseSign::whereHas('course', function ($query) use ($start_date, $end_date) {
|
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
|
$query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
->whereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
->orWhereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
})->whereNotIn('status', [4, 5])->get();
|
|
|
|
|
$list = Company::whereHas('users', function ($query) use ($courseSignByType) {
|
|
|
|
|
$query->whereIn('id', $courseSignByType->pluck('user_id'));
|
|
|
|
|
@ -181,7 +181,7 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
$courseSignsForGanbu = self::whereHas('course', function ($query) use ($start_date, $end_date) {
|
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
|
$query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
->whereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
->orWhereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
})->where(function ($query) use ($course_ids) {
|
|
|
|
|
if ($course_ids) {
|
|
|
|
|
$query->whereIn('course_id', $course_ids);
|
|
|
|
|
@ -211,7 +211,7 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
$courseSignsForStock = self::whereHas('course', function ($query) use ($start_date, $end_date) {
|
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
|
$query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
->whereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
->orWhereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
})->where(function ($query) use ($course_ids) {
|
|
|
|
|
if ($course_ids) {
|
|
|
|
|
$query->whereIn('course_id', $course_ids);
|
|
|
|
|
@ -268,7 +268,7 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
})->whereHas('course', function ($query) use ($start_date, $end_date) {
|
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
|
$query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
->whereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
->orWhereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
})->whereHas('user')->whereNotIn('status', [4, 5]);
|
|
|
|
|
// 地区
|
|
|
|
|
$suzhouArea = Company::where('company_city', '苏州市')->pluck('company_area')->unique();
|
|
|
|
|
|