diff --git a/app/Exports/CommonExport.php b/app/Exports/CommonExport.php index dfb7c41..97daf33 100755 --- a/app/Exports/CommonExport.php +++ b/app/Exports/CommonExport.php @@ -64,7 +64,7 @@ class CommonExport implements FromCollection } elseif (str_contains($field, 'partners')) { // 股东信息 $temp[$field] = $this->partners($info); - } elseif (str_contains($field, 'partners')) { + } elseif (str_contains($field, 'project_users')) { // 项目经理 $temp[$field] = $this->projectManager($info); } elseif (str_contains($field, 'users')) { @@ -156,7 +156,7 @@ class CommonExport implements FromCollection { $list = []; foreach ($data['project_users'] as $item) { - $list[] = $item['groupName'] . '-' . $item['userName'] ?? ''; + $list[] = $item['groupName'] . '-' . ($item['userName'] ?? '') . '-' . ($item['investDate'] ?? ''); } return implode("、\r\n", $list); } @@ -169,7 +169,11 @@ class CommonExport implements FromCollection { $list = []; foreach ($data['users'] as $item) { - $list[] = $item['username'] . '-' . $item['company_position'] . '-' . $item['mobile'] ?? ''; + $base = $item['no'] . '-' . $item['username'] . '-' . $item['is_schoolmate_text'] . '-' . $item['company_position'] . '-' . ($item['mobile'] ?? ''); + foreach ($item['course_signs'] as $i) { + $base .= '-' . $i['course']['name'] . '-' . ($i['created_at'] ?? ''); + } + $list[] = $base; } return implode("、\r\n", $list); }