master
cody 3 months ago
parent b78ee9ed84
commit faf909e4d5

@ -848,8 +848,7 @@ class OtherController extends CommonController
'course_count' => 0, 'course_count' => 0,
]); ]);
} else { } else {
// 每个学员一行 // 每个学员一行,每行都显示完整的公司信息
$isFirstRow = true;
foreach ($users as $user) { foreach ($users as $user) {
$courseSigns = $user->courseSigns ?? collect([]); $courseSigns = $user->courseSigns ?? collect([]);
@ -866,33 +865,13 @@ class OtherController extends CommonController
// 报名课程数 // 报名课程数
$courseCount = $courseSigns->count(); $courseCount = $courseSigns->count();
if ($isFirstRow) { // 每个学员一行,每行都显示完整的公司信息
// 第一行:显示公司信息 $data[] = array_merge($companyInfo, [
$data[] = array_merge($companyInfo, [ 'user_name' => $user->name ?? '',
'user_name' => $user->name ?? '', 'course_names' => $courseNames,
'course_names' => $courseNames, 'course_types' => $courseTypes,
'course_types' => $courseTypes, 'course_count' => $courseCount,
'course_count' => $courseCount, ]);
]);
$isFirstRow = false;
} else {
// 后续行:公司信息为空
$data[] = [
'company_name' => '',
'company_legal_representative' => '',
'company_date' => '',
'stock_date' => '',
'is_after_enrollment' => '',
'company_address' => '',
'company_city' => '',
'company_area' => '',
'company_tag' => '',
'user_name' => $user->name ?? '',
'course_names' => $courseNames,
'course_types' => $courseTypes,
'course_count' => $courseCount,
];
}
} }
} }
} else { } else {

Loading…
Cancel
Save