master
cody 3 months ago
parent 365cbb66ab
commit 53f67e9c33

@ -507,7 +507,8 @@ class OtherController extends CommonController
$usersData[$userId]['courseSigns'][] = $sign; $usersData[$userId]['courseSigns'][] = $sign;
} }
// 每个学员一行,每行都显示完整的公司信息 // 每个学员一行,公司信息只在第一行显示,后续行公司信息为空
$isFirstRow = true;
foreach ($usersData as $userData) { foreach ($usersData as $userData) {
$user = $userData['user']; $user = $userData['user'];
$courseSigns = collect($userData['courseSigns']); $courseSigns = collect($userData['courseSigns']);
@ -526,13 +527,33 @@ class OtherController extends CommonController
// 报名课程数 // 报名课程数
$courseCount = $courseSigns->count(); $courseCount = $courseSigns->count();
// 每个学员一行,每行都显示完整的公司信息 if ($isFirstRow) {
$data[] = array_merge($companyInfo, [ // 第一行:显示公司信息
'user_name' => $user->name ?? '', $data[] = array_merge($companyInfo, [
'course_names' => $courseNames, 'user_name' => $user->name ?? '',
'course_types' => $courseTypes, 'course_names' => $courseNames,
'course_count' => $courseCount, 'course_types' => $courseTypes,
]); 'course_count' => $courseCount,
]);
$isFirstRow = false;
} else {
// 后续行:公司信息为空
$data[] = [
'company_name' => '',
'company_legal_representative' => '',
'company_date' => '',
'company_address' => '',
'business_scope' => '',
'contact_phone' => '',
'contact_mail' => '',
'company_tag' => '',
'credit_code' => '',
'user_name' => $user->name ?? '',
'course_names' => $courseNames,
'course_types' => $courseTypes,
'course_count' => $courseCount,
];
}
} }
} }
} }

Loading…
Cancel
Save