diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 497de00..7910c4c 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -273,9 +273,15 @@ class OtherController extends CommonController $courseType->course_signs_total = $courseType->history_course_signs_total + $courseType->now_course_signs_total; } + // 统计 is_chart=0 的课程类型数据,组成"其他"统计项 + $otherCourseType = CourseType::getOtherStatistics($configStartDate, $configEndDate); + $courseTypes->push($otherCourseType); + + $configCourseIds = $configCourseIds->merge(CourseType::getOtherCourseIds($configStartDate, $configEndDate)); + // 将统计数据直接组合到配置对象中 $config->courseTypes = $courseTypes; - // 总期数 + // 总期数(含"其他") $config->course_periods_total = $courseTypes->sum('course_periods_total'); // 总去重人数(与 courses-home 的 course_signs_pass_unique 口径一致:courseSignsTotalByUnique) $config->course_signs_unique_total = CourseSign::courseSignsTotalByUnique($configStartDate, $configEndDate, 1, $configCourseIds->unique()->values(), false);