master
cody 2 weeks ago
parent 73fb08c353
commit 4e7307a374

@ -593,45 +593,30 @@ class OtherController extends CommonController
'course_type' => '', '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)) {
// 如果学员没有课程,仍然导出学员基本信息 // 合并同一学员的多个课程:格式为"课程体系-课程名称,课程体系-课程名称"
if ($isFirstRow) { $courseList = [];
// 第一行:显示公司信息 foreach ($courses as $courseInfo) {
$data[] = array_merge($companyInfo, [ $courseType = $courseInfo['course_type'] ?? '';
'user_name' => $userInfo['user_name'] ?? '', $courseName = $courseInfo['course_name'] ?? '';
'course_name' => '', if ($courseType && $courseName) {
'course_type' => '', $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' => '',
'course_type' => '',
];
} }
} else { }
// 每个课程一行 $courseDisplay = implode('', $courseList);
foreach ($courses as $courseIndex => $courseInfo) {
if ($isFirstRow && $courseIndex === 0) { if ($isFirstRow) {
// 第一行:显示公司信息 // 第一行:显示公司信息
$data[] = array_merge($companyInfo, [ $data[] = array_merge($companyInfo, [
'user_name' => $userInfo['user_name'] ?? '', 'user_name' => $userInfo['user_name'] ?? '',
'course_name' => $courseInfo['course_name'] ?? '', 'course_name' => $courseDisplay,
'course_type' => $courseInfo['course_type'] ?? '', 'course_type' => '', // 课程类型已合并到课程名称中
]); ]);
$isFirstRow = false; $isFirstRow = false;
} else { } else {
@ -646,15 +631,13 @@ class OtherController extends CommonController
'company_area' => '', 'company_area' => '',
'company_tag' => '', 'company_tag' => '',
'user_name' => $userInfo['user_name'] ?? '', 'user_name' => $userInfo['user_name'] ?? '',
'course_name' => $courseInfo['course_name'] ?? '', 'course_name' => $courseDisplay,
'course_type' => $courseInfo['course_type'] ?? '', 'course_type' => '', // 课程类型已合并到课程名称中
]; ];
} }
} }
} }
} }
}
}
$fields = [ $fields = [
'company_name' => '企业名称', 'company_name' => '企业名称',
'company_legal_representative' => '法人', 'company_legal_representative' => '法人',
@ -665,7 +648,7 @@ class OtherController extends CommonController
'company_area' => '所在区域', 'company_area' => '所在区域',
'company_tag' => '企业资质', 'company_tag' => '企业资质',
'user_name' => '学员姓名', 'user_name' => '学员姓名',
'course_name' => '课程名称', 'course_name' => '课程信息',
'course_type' => '课程类型', 'course_type' => '课程类型',
]; ];
$filename = '上市公司明细'; $filename = '上市公司明细';

Loading…
Cancel
Save