diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 5badd43..d7af385 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -130,9 +130,9 @@ class OtherController extends CommonController $course_type_id = CourseType::pluck('id')->toArray(); } // 课程 - $courses = Course::where('start_date', '>=', $start_date) - ->where('start_date', '<=', $end_date) - ->whereIn('type', $course_type_id) + $courses = Course::whereIn('type', $course_type_id) + // ->where('start_date', '<=', $end_date) + // ->where('start_date', '>=', $start_date) ->get(); // 被投企业数 $list['course_signs_invested'] = CourseSign::yhInvested($start_date, $end_date); @@ -156,17 +156,17 @@ class OtherController extends CommonController $courseTypes = CourseType::whereIn('id', $course_type_id)->get(); foreach ($courseTypes as $courseType) { // 获取课程 - $courses2 = Course::where('start_date', '>=', $start_date) - ->where('start_date', '<=', $end_date) - ->where('type', $courseType->id) + $courses2 = Course::where('type', $courseType->id) + // ->where('start_date', '<=', $end_date) + // ->where('start_date', '>=', $start_date) ->get(); foreach ($courses2 as $course) { $courseTypesSum[] = [ 'course_type' => $courseType->name, // 培养人数 - 'course_type_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses2->pluck('id')->toArray()), + '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')->toArray()), + '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]), ]; @@ -176,8 +176,8 @@ class OtherController extends CommonController // 区域明细统计 $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')->toArray(), $area->value); - $area->course_signs_pass_unique = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id')->toArray(), $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');