diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 69d28fd..58d24b1 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')); } /**