|
|
|
|
@ -82,7 +82,7 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
$total = CourseSign::whereDate('created_at', '>=', $start_date)
|
|
|
|
|
->whereDate('created_at', '<=', $end_date)
|
|
|
|
|
->whereHas('user', function ($query) use ($area) {
|
|
|
|
|
if ($area) {
|
|
|
|
|
if (isset($area)) {
|
|
|
|
|
if ($area == '苏州市外') {
|
|
|
|
|
$allArea = ParameterDetail::where('parameter_id', 5)->get();
|
|
|
|
|
$query->whereNotIn('company_area', $allArea->pluck('value'));
|
|
|
|
|
@ -110,11 +110,13 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
$courseSignByType = CourseSign::whereDate('created_at', '>=', $start_date)
|
|
|
|
|
->whereDate('created_at', '<=', $end_date)
|
|
|
|
|
->whereHas('user', function ($query) use ($area) {
|
|
|
|
|
if ($area == '苏州市外') {
|
|
|
|
|
$allArea = ParameterDetail::where('parameter_id', 5)->get();
|
|
|
|
|
$query->whereNotIn('company_area', $allArea->pluck('value'));
|
|
|
|
|
} else {
|
|
|
|
|
$query->where('company_area', $area);
|
|
|
|
|
if (isset($area)) {
|
|
|
|
|
if ($area == '苏州市外') {
|
|
|
|
|
$allArea = ParameterDetail::where('parameter_id', 5)->get();
|
|
|
|
|
$query->whereNotIn('company_area', $allArea->pluck('value'));
|
|
|
|
|
} else {
|
|
|
|
|
$query->where('company_area', $area);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})->where(function ($query) use ($status, $course_ids) {
|
|
|
|
|
if (isset($status)) {
|
|
|
|
|
|