|
@@ -483,9 +483,12 @@ class ExportFileService extends Service
|
|
|
$totalRow[] = $grandTotalSalary;
|
|
$totalRow[] = $grandTotalSalary;
|
|
|
$exportData[] = $totalRow;
|
|
$exportData[] = $totalRow;
|
|
|
|
|
|
|
|
|
|
+ //获取公司基本信息
|
|
|
|
|
+ $company = EmployeeService::getCompanyDetail($user);
|
|
|
|
|
+
|
|
|
$file_name = "项目工资统计表_" . date("Y-m-d") . "_". rand(1000,9999);
|
|
$file_name = "项目工资统计表_" . date("Y-m-d") . "_". rand(1000,9999);
|
|
|
$filename = $file_name . '.' . 'xlsx';
|
|
$filename = $file_name . '.' . 'xlsx';
|
|
|
- $bool = Excel::store(new ItemSalarySheetExport($projects, $exportData, Depart::where('id', $user['top_depart_id'])->value('title')),"/public/export/{$filename}", null, 'Xlsx', []);
|
|
|
|
|
|
|
+ $bool = Excel::store(new ItemSalarySheetExport($projects, $exportData, $company['title'] ?? ''),"/public/export/{$filename}", null, 'Xlsx', []);
|
|
|
|
|
|
|
|
return [true, $filename];
|
|
return [true, $filename];
|
|
|
}
|
|
}
|
|
@@ -697,11 +700,14 @@ class ExportFileService extends Service
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ //获取公司基本信息
|
|
|
|
|
+ $company = EmployeeService::getCompanyDetail($user);
|
|
|
|
|
+
|
|
|
$file_name = "项目工资分摊统计表_" . date("Y-m-d") . "_". rand(1000,9999);
|
|
$file_name = "项目工资分摊统计表_" . date("Y-m-d") . "_". rand(1000,9999);
|
|
|
$filename = $file_name . '.xlsx';
|
|
$filename = $file_name . '.xlsx';
|
|
|
|
|
|
|
|
Excel::store(
|
|
Excel::store(
|
|
|
- new ItemSalaryFTMultipleSheetExport($monthsData, Depart::where('id', $user['top_depart_id'])->value('title')),
|
|
|
|
|
|
|
+ new ItemSalaryFTMultipleSheetExport($monthsData, $company['title'] ?? ''),
|
|
|
"/public/export/{$filename}"
|
|
"/public/export/{$filename}"
|
|
|
);
|
|
);
|
|
|
|
|
|
|
@@ -851,11 +857,14 @@ class ExportFileService extends Service
|
|
|
->setTimezone(config('app.timezone')) // 转换为 Laravel 配置的时区
|
|
->setTimezone(config('app.timezone')) // 转换为 Laravel 配置的时区
|
|
|
->format('Y');
|
|
->format('Y');
|
|
|
|
|
|
|
|
|
|
+ //获取公司基本信息
|
|
|
|
|
+ $company = EmployeeService::getCompanyDetail($user);
|
|
|
|
|
+
|
|
|
// 3. 组织多 Sheet 格式数据
|
|
// 3. 组织多 Sheet 格式数据
|
|
|
$monthsData = [
|
|
$monthsData = [
|
|
|
$year => [
|
|
$year => [
|
|
|
- 'tax_id' => $user->tax_id ?? '***********',
|
|
|
|
|
- 'company_name' => Depart::where('id', $user['top_depart_id'])->value('title'),
|
|
|
|
|
|
|
+ 'tax_id' => $company['code'] ?? '',
|
|
|
|
|
+ 'company_name' => $company['title'] ?? '',
|
|
|
'items' => $items,
|
|
'items' => $items,
|
|
|
'dynamic_headers' => $dynamicHeaders
|
|
'dynamic_headers' => $dynamicHeaders
|
|
|
]
|
|
]
|