master
cody 3 months ago
parent 7d1ac2a49b
commit 5f71173229

@ -449,12 +449,23 @@ class OtherController extends CommonController
switch ($export_type) { switch ($export_type) {
case 'course_signs_invested': case 'course_signs_invested':
// 被投企业明细 - 使用与coursesHome相同的算法 // 被投企业明细 - 使用与coursesHome相同的算法
$companies = CourseSign::yhInvestedTotal(CourseType::START_DATE, $end_date, $course_ids, true); // 确保 $course_ids 是数组格式
$courseIdsArray = $course_ids ? (is_array($course_ids) ? $course_ids : $course_ids->toArray()) : null;
$companies = CourseSign::yhInvestedTotal(CourseType::START_DATE, $end_date, $courseIdsArray, true);
foreach ($companies as $company) { foreach ($companies as $company) {
// 获取该公司的学员信息 // 获取该公司的学员信息
// 使用与yhInvestedTotal相同的筛选逻辑status=1筛选course_ids和日期范围 // 使用与yhInvestedTotal相同的筛选逻辑status=1筛选course_ids和日期范围
$userIds = $company->users()->pluck('id'); // 直接通过公司ID查询学员
$userCourseSigns = CourseSign::getStudentList(CourseType::START_DATE, $end_date, 1, $course_ids) $userIds = User::where('company_id', $company->id)->pluck('id')->toArray();
if (empty($userIds)) {
// 如果没有学员,设置空值
$userNamesStr = '';
$courseNamesStr = '';
$courseTypesStr = '';
$totalCourseCount = 0;
} else {
$userCourseSigns = CourseSign::getStudentList(CourseType::START_DATE, $end_date, 1, $courseIdsArray)
->whereIn('user_id', $userIds) ->whereIn('user_id', $userIds)
->with(['user', 'course.typeDetail']) ->with(['user', 'course.typeDetail'])
->get(); ->get();
@ -462,6 +473,9 @@ class OtherController extends CommonController
// 按学员分组 // 按学员分组
$usersData = []; $usersData = [];
foreach ($userCourseSigns as $sign) { foreach ($userCourseSigns as $sign) {
if (!$sign->user) {
continue;
}
$userId = $sign->user_id; $userId = $sign->user_id;
if (!isset($usersData[$userId])) { if (!isset($usersData[$userId])) {
$usersData[$userId] = [ $usersData[$userId] = [
@ -506,6 +520,7 @@ class OtherController extends CommonController
$userNamesStr = implode('、', array_filter(array_unique($userNames))); $userNamesStr = implode('、', array_filter(array_unique($userNames)));
$courseNamesStr = implode('、', array_filter(array_unique($allCourseNames))); $courseNamesStr = implode('、', array_filter(array_unique($allCourseNames)));
$courseTypesStr = implode('、', array_filter(array_unique($allCourseTypes))); $courseTypesStr = implode('、', array_filter(array_unique($allCourseTypes)));
}
$data[] = [ $data[] = [
'company_name' => $company->company_name, 'company_name' => $company->company_name,

Loading…
Cancel
Save