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 ec9377aa39
commit 1fda29d60d
2 changed files with 61 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -565,13 +565,14 @@ class OtherController extends CommonController
case 'company_market_total': case 'company_market_total':
// 上市公司明细 - 所有上市公司，关联学员、课程信息 // 上市公司明细 - 所有上市公司，关联学员、课程信息
// 数据结构：主表是公司，子数据是学员信息
$companiesData = CourseSign::shangshi($start_date, $end_date, $course_ids->toArray(), true); $companiesData = CourseSign::shangshi($start_date, $end_date, $course_ids->toArray(), true);
foreach ($companiesData as $item) { foreach ($companiesData as $item) {
$company = $item['company']; $company = $item['company'];
$courseSigns = $item['courseSigns'] ?? []; $users = $item['users'] ?? [];
if (empty($courseSigns)) { if (empty($users)) {
// 如果没有学员报名记录，仍然导出公司基本信息 // 如果没有学员报名记录，仍然导出公司基本信息
$data[] = [ $data[] = [
'company_name' => $company->company_name, 'company_name' => $company->company_name,
@ -586,20 +587,40 @@ class OtherController extends CommonController
'course_type' => '', 'course_type' => '',
]; ];
} else { } else {
// 每个学员-课程组合一行 // 每个学员的每个课程组合一行
foreach ($courseSigns as $courseSign) { foreach ($users as $userInfo) {
$data[] = [ $courses = $userInfo['courses'] ?? [];
'company_name' => $company->company_name, if (empty($courses)) {
'company_legal_representative' => $company->company_legal_representative ?? '', // 如果学员没有课程，仍然导出学员基本信息
'company_date' => $company->company_date ?? '', $data[] = [
'stock_date' => $company->stock_date ?? '', 'company_name' => $company->company_name,
'company_address' => $company->company_address ?? '', 'company_legal_representative' => $company->company_legal_representative ?? '',
'company_city' => $company->company_city ?? '', 'company_date' => $company->company_date ?? '',
'company_area' => $company->company_area ?? '', 'stock_date' => $company->stock_date ?? '',
'user_name' => $courseSign->user->name ?? '', 'company_address' => $company->company_address ?? '',
'course_name' => $courseSign->course->name ?? '', 'company_city' => $company->company_city ?? '',
'course_type' => $courseSign->course->typeDetail->name ?? '', 'company_area' => $company->company_area ?? '',
]; 'user_name' => $userInfo['user_name'] ?? '',
'course_name' => '',
'course_type' => '',
];
} else {
// 每个课程一行
foreach ($courses as $courseInfo) {
$data[] = [
'company_name' => $company->company_name,
'company_legal_representative' => $company->company_legal_representative ?? '',
'company_date' => $company->company_date ?? '',
'stock_date' => $company->stock_date ?? '',
'company_address' => $company->company_address ?? '',
'company_city' => $company->company_city ?? '',
'company_area' => $company->company_area ?? '',
'user_name' => $userInfo['user_name'] ?? '',
'course_name' => $courseInfo['course_name'] ?? '',
'course_type' => $courseInfo['course_type'] ?? '',
];
}
}
} }
} }
} }

28
app/Models/CourseSign.php
Unescape View File

@ -520,7 +520,7 @@ class CourseSign extends SoftDeletesModel
->keyBy('id'); ->keyBy('id');
if ($retList) { if ($retList) {
// 返回详细列表，包含学员、课程信息 // 返回详细列表：主表是公司，子数据是学员信息
$result = []; $result = [];
foreach ($courseSigns as $courseSign) { foreach ($courseSigns as $courseSign) {
if (!$courseSign->user || !$courseSign->user->company) { if (!$courseSign->user || !$courseSign->user->company) {
@ -539,12 +539,32 @@ class CourseSign extends SoftDeletesModel
if (!isset($result[$companyId])) { if (!isset($result[$companyId])) {
$result[$companyId] = [ $result[$companyId] = [
'company' => $company, 'company' => $company,
'courseSigns' => [], 'users' => [],
]; ];
} }
// 添加学员报名记录（包含学员、课程信息） // 按学员分组，收集每个学员的课程信息
$result[$companyId]['courseSigns'][] = $courseSign; $userId = $courseSign->user->id;
if (!isset($result[$companyId]['users'][$userId])) {
$result[$companyId]['users'][$userId] = [
'user' => $courseSign->user,
'user_name' => $courseSign->user->name ?? '',
'mobile' => $courseSign->user->mobile ?? '',
'courses' => [],
];
}
// 添加该学员的课程信息
$result[$companyId]['users'][$userId]['courses'][] = [
'course_name' => $courseSign->course->name ?? '',
'course_type' => $courseSign->course->typeDetail->name ?? '',
'course_sign' => $courseSign,
];
}
// 将 users 转换为数组（去掉 user_id 作为 key）
foreach ($result as $companyId => $item) {
$result[$companyId]['users'] = array_values($item['users']);
} }
// 转换为数组并返回 // 转换为数组并返回

Write Preview
Loading…
Cancel
Save