master
cody 2 weeks ago
parent 3312b21caf
commit c664a477a4

@ -590,75 +590,49 @@ class OtherController extends CommonController
$data[] = array_merge($companyInfo, [ $data[] = array_merge($companyInfo, [
'user_name' => '', 'user_name' => '',
'course_name' => '', 'course_name' => '',
'course_type' => '',
]); ]);
} else { } else {
// 每个学员的每个课程一行,格式为"课程名称-课程体系" // 每个学员一行,多个课程合并显示
$isFirstRow = true; $isFirstRow = true;
foreach ($users as $userInfo) { foreach ($users as $userInfo) {
$courses = $userInfo['courses'] ?? []; $courses = $userInfo['courses'] ?? [];
if (empty($courses)) { // 合并同一学员的多个课程:格式为"课程体系-课程名称,课程体系-课程名称"
// 如果学员没有课程,仍然导出学员基本信息 $courseList = [];
if ($isFirstRow) { foreach ($courses as $courseInfo) {
// 第一行:显示公司信息 $courseType = $courseInfo['course_type'] ?? '';
$data[] = array_merge($companyInfo, [ $courseName = $courseInfo['course_name'] ?? '';
'user_name' => $userInfo['user_name'] ?? '', if ($courseType && $courseName) {
'course_name' => '', $courseList[] = $courseType . '-' . $courseName;
]); } elseif ($courseName) {
$isFirstRow = false; $courseList[] = $courseName;
} else {
// 后续行:公司信息为空
$data[] = [
'company_name' => '',
'company_legal_representative' => '',
'company_date' => '',
'stock_date' => '',
'company_address' => '',
'company_city' => '',
'company_area' => '',
'company_tag' => '',
'user_name' => $userInfo['user_name'] ?? '',
'course_name' => '',
];
} }
}
$courseDisplay = implode("\r\n", $courseList);
if ($isFirstRow) {
// 第一行:显示公司信息
$data[] = array_merge($companyInfo, [
'user_name' => $userInfo['user_name'] ?? '',
'course_name' => $courseDisplay,
'course_type' => '', // 课程类型已合并到课程名称中
]);
$isFirstRow = false;
} else { } else {
// 每个课程一行,格式为"课程名称-课程体系" // 后续行:公司信息为空
foreach ($courses as $courseIndex => $courseInfo) { $data[] = [
$courseName = $courseInfo['course_name'] ?? ''; 'company_name' => '',
$courseType = $courseInfo['course_type'] ?? ''; 'company_legal_representative' => '',
'company_date' => '',
// 格式:课程名称-课程体系 'stock_date' => '',
if ($courseName && $courseType) { 'company_address' => '',
$courseDisplay = $courseName . '-' . $courseType; 'company_city' => '',
} elseif ($courseName) { 'company_area' => '',
$courseDisplay = $courseName; 'company_tag' => '',
} else { 'user_name' => $userInfo['user_name'] ?? '',
$courseDisplay = ''; 'course_name' => $courseDisplay,
} ];
if ($isFirstRow && $courseIndex === 0) {
// 第一行:显示公司信息
$data[] = array_merge($companyInfo, [
'user_name' => $userInfo['user_name'] ?? '',
'course_name' => $courseDisplay,
]);
$isFirstRow = false;
} else {
// 后续行:公司信息为空
$data[] = [
'company_name' => '',
'company_legal_representative' => '',
'company_date' => '',
'stock_date' => '',
'company_address' => '',
'company_city' => '',
'company_area' => '',
'company_tag' => '',
'user_name' => $userInfo['user_name'] ?? '',
'course_name' => $courseDisplay,
];
}
}
} }
} }
} }

Loading…
Cancel
Save