diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 58d24b1..69d28fd 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -134,23 +134,23 @@ class OtherController extends CommonController // ->where('start_date', '<=', $end_date) // ->where('start_date', '>=', $start_date) ->get(); -// // 被投企业数 -// $list['course_signs_invested'] = CourseSign::yhInvested($start_date, $end_date); -// // 报名人数 -// $list['course_signs_total'] = CourseSign::courseSignsTotal($start_date, $end_date); -// // 审核通过人数 -// $list['course_signs_pass'] = CourseSign::courseSignsTotal($start_date, $end_date, 1); -// // 审核通过人数去重 -// $list['course_signs_pass_unique'] = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1); -// // 开课场次 -// $calendar = Calendar::whereIn('course_id', $courses->pluck('id'))->whereBetween('date', [$start_date, $end_date])->get(); -// $list['course_total'] = $calendar->count(); -// // 开课天数 -// $list['course_day_total'] = $calendar->sum(function ($course) { -// $start = Carbon::parse($course->start_time); -// $end = Carbon::parse($course->end_time); -// return $end->diffInDays($start) + 1; // 包含起始和结束日期 -// }); + // 被投企业数 + $list['course_signs_invested'] = CourseSign::yhInvested($start_date, $end_date); + // 报名人数 + $list['course_signs_total'] = CourseSign::courseSignsTotal($start_date, $end_date); + // 审核通过人数 + $list['course_signs_pass'] = CourseSign::courseSignsTotal($start_date, $end_date, 1); + // 审核通过人数去重 + $list['course_signs_pass_unique'] = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1); + // 开课场次 + $calendar = Calendar::whereIn('course_id', $courses->pluck('id'))->whereBetween('date', [$start_date, $end_date])->get(); + $list['course_total'] = $calendar->count(); + // 开课天数 + $list['course_day_total'] = $calendar->sum(function ($course) { + $start = Carbon::parse($course->start_time); + $end = Carbon::parse($course->end_time); + return $end->diffInDays($start) + 1; // 包含起始和结束日期 + }); // 课程分类明细统计 $courseTypesSum = []; $courseTypes = CourseType::whereIn('id', $course_type_id)->get(); @@ -164,23 +164,23 @@ class OtherController extends CommonController $courseTypesSum[] = [ 'course_type' => $courseType->name, // 培养人数 - // 'course_type_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses2->pluck('id')), + 'course_type_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses2->pluck('id')), // 去重培养人数 'course_type_signs_pass_unique' => CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses2->pluck('id')), 'course_name' => $course->name, - // 'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id]), + 'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id]), ]; } } // 区域明细统计 $areas = ParameterDetail::where('parameter_id', 5)->get(); foreach ($areas as $area) { - // $area->course_signs_pass = CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses->pluck('id'), $area->value); + $area->course_signs_pass = CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses->pluck('id'), $area->value); $area->course_signs_pass_unique = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id'), $area->value); } $area_course_signs_pass_total = collect($areas)->sum('course_signs_pass'); $area_course_signs_pass_unique_total = collect($areas)->sum('course_signs_pass_unique'); - // return $this->success(compact('list', 'courseTypesSum', 'areas', 'area_course_signs_pass_total', 'area_course_signs_pass_unique_total')); + return $this->success(compact('list', 'courseTypesSum', 'areas', 'area_course_signs_pass_total', 'area_course_signs_pass_unique_total')); } /** diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index 8fb3868..92a1f1b 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -111,14 +111,14 @@ class CourseSign extends SoftDeletesModel $courseSignByType = CourseSign::whereDate('created_at', '>=', $start_date) ->whereDate('created_at', '<=', $end_date) ->whereHas('user', function ($query) use ($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); - } - } +// 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)) { $query->where('status', $status); diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 22204b7..33c3930 100755 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -28,22 +28,22 @@ class EventServiceProvider extends ServiceProvider */ public function boot() { - DB::listen( - function ($query) { - $tmp = str_replace('?', '"' . '%s' . '"', $query->sql); - $qBindings = []; - foreach ($query->bindings as $key => $value) { - if (is_numeric($key)) { - $qBindings[] = $value; - } else { - $tmp = str_replace(':' . $key, '"' . $value . '"', $tmp); - } - } - $tmp = vsprintf($tmp, $qBindings); - $tmp = str_replace("\\", "", $tmp); - Log::info(' execution time: ' . $query->time . 'ms; ' . $tmp . "\n\t"); - } - ); +// DB::listen( +// function ($query) { +// $tmp = str_replace('?', '"' . '%s' . '"', $query->sql); +// $qBindings = []; +// foreach ($query->bindings as $key => $value) { +// if (is_numeric($key)) { +// $qBindings[] = $value; +// } else { +// $tmp = str_replace(':' . $key, '"' . $value . '"', $tmp); +// } +// } +// $tmp = vsprintf($tmp, $qBindings); +// $tmp = str_replace("\\", "", $tmp); +// Log::info(' execution time: ' . $query->time . 'ms; ' . $tmp . "\n\t"); +// } +// ); } /**