master
cody 2 weeks ago
parent 4e7307a374
commit 3312b21caf

@ -590,33 +590,57 @@ 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 = []; // 如果学员没有课程,仍然导出学员基本信息
foreach ($courses as $courseInfo) { if ($isFirstRow) {
$courseType = $courseInfo['course_type'] ?? ''; // 第一行:显示公司信息
$data[] = array_merge($companyInfo, [
'user_name' => $userInfo['user_name'] ?? '',
'course_name' => '',
]);
$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' => '',
];
}
} else {
// 每个课程一行,格式为"课程名称-课程体系"
foreach ($courses as $courseIndex => $courseInfo) {
$courseName = $courseInfo['course_name'] ?? ''; $courseName = $courseInfo['course_name'] ?? '';
if ($courseType && $courseName) { $courseType = $courseInfo['course_type'] ?? '';
$courseList[] = $courseType . '-' . $courseName;
// 格式:课程名称-课程体系
if ($courseName && $courseType) {
$courseDisplay = $courseName . '-' . $courseType;
} elseif ($courseName) { } elseif ($courseName) {
$courseList[] = $courseName; $courseDisplay = $courseName;
} } else {
$courseDisplay = '';
} }
$courseDisplay = implode('', $courseList);
if ($isFirstRow) { if ($isFirstRow && $courseIndex === 0) {
// 第一行:显示公司信息 // 第一行:显示公司信息
$data[] = array_merge($companyInfo, [ $data[] = array_merge($companyInfo, [
'user_name' => $userInfo['user_name'] ?? '', 'user_name' => $userInfo['user_name'] ?? '',
'course_name' => $courseDisplay, 'course_name' => $courseDisplay,
'course_type' => '', // 课程类型已合并到课程名称中
]); ]);
$isFirstRow = false; $isFirstRow = false;
} else { } else {
@ -632,12 +656,13 @@ class OtherController extends CommonController
'company_tag' => '', 'company_tag' => '',
'user_name' => $userInfo['user_name'] ?? '', 'user_name' => $userInfo['user_name'] ?? '',
'course_name' => $courseDisplay, 'course_name' => $courseDisplay,
'course_type' => '', // 课程类型已合并到课程名称中
]; ];
} }
} }
} }
} }
}
}
$fields = [ $fields = [
'company_name' => '企业名称', 'company_name' => '企业名称',
'company_legal_representative' => '法人', 'company_legal_representative' => '法人',
@ -649,7 +674,6 @@ class OtherController extends CommonController
'company_tag' => '企业资质', 'company_tag' => '企业资质',
'user_name' => '学员姓名', 'user_name' => '学员姓名',
'course_name' => '课程信息', 'course_name' => '课程信息',
'course_type' => '课程类型',
]; ];
$filename = '上市公司明细'; $filename = '上市公司明细';
break; break;

Loading…
Cancel
Save