tanyuan
/
wx.sstbc.com
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
master
cody 2 weeks ago
parent 73fb08c353
commit 4e7307a374
1 changed files with 37 additions and 54 deletions
Show Stats Download Patch File Download Diff File

91
app/Http/Controllers/Admin/OtherController.php
Unescape View File

@ -593,64 +593,47 @@ 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' => '',
];
} }
}
$courseDisplay = implode('，', $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[] = [
if ($isFirstRow && $courseIndex === 0) { 'company_name' => '',
// 第一行：显示公司信息 'company_legal_representative' => '',
$data[] = array_merge($companyInfo, [ 'company_date' => '',
'user_name' => $userInfo['user_name'] ?? '', 'stock_date' => '',
'course_name' => $courseInfo['course_name'] ?? '', 'company_address' => '',
'course_type' => $courseInfo['course_type'] ?? '', 'company_city' => '',
]); 'company_area' => '',
$isFirstRow = false; 'company_tag' => '',
} else { 'user_name' => $userInfo['user_name'] ?? '',
// 后续行：公司信息为空 'course_name' => $courseDisplay,
$data[] = [ 'course_type' => '', // 课程类型已合并到课程名称中
'company_name' => '', ];
'company_legal_representative' => '',
'company_date' => '',
'stock_date' => '',
'company_address' => '',
'company_city' => '',
'company_area' => '',
'company_tag' => '',
'user_name' => $userInfo['user_name'] ?? '',
'course_name' => $courseInfo['course_name'] ?? '',
'course_type' => $courseInfo['course_type'] ?? '',
];
}
}
} }
} }
} }
@ -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 = '上市公司明细';

Write Preview
Loading…
Cancel
Save