WuYongJie/CaiWuXiTong
1
0
Fork 0
Code Issues Pull Requests 8 Packages Projects Releases Wiki Activity

fix: 修正系统化待办浏览器上传识别

Browse Source
This commit is contained in:
yueyang 2026-10-27 15:53:56 +08:00
parent 9f67e2a308
commit 89c4da5c1e
3 changed files with 74 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Business/SystemizationTodoWorkbookImporter.php
View File

@ -33,13 +33,18 @@ class SystemizationTodoWorkbookImporter
*
* @return array{created:int,skipped:int,sheet:string}
*/
public function import(string $path, int $companyId, ?int $userId = null): array
public function import(
string $path,
int $companyId,
?int $userId = null,
?string $originalName = null,
): array
{
if (! is_file($path)) {
throw new RuntimeException('找不到待办 Excel 文件。');
}
$extension = strtolower(pathinfo($path, PATHINFO_EXTENSION));
$extension = $this->extension($path, $originalName);
if ($extension !== 'xlsx') {
throw new RuntimeException('系统化待办仅支持 .xlsx 文件。');
}
@ -120,13 +125,19 @@ class SystemizationTodoWorkbookImporter
*
* @return array{created:int,updated:int,retained:int,sheet:string}
*/
public function sync(string $path, int $companyId, ?int $userId = null, bool $dryRun = false): array
public function sync(
string $path,
int $companyId,
?int $userId = null,
bool $dryRun = false,
?string $originalName = null,
): array
{
if (! is_file($path)) {
throw new RuntimeException('找不到待办 Excel 文件。');
}
$extension = strtolower(pathinfo($path, PATHINFO_EXTENSION));
$extension = $this->extension($path, $originalName);
if ($extension !== 'xlsx') {
throw new RuntimeException('系统化待办仅支持 .xlsx 文件。');
}
@ -721,6 +732,16 @@ class SystemizationTodoWorkbookImporter
return trim(str_replace("\u{00A0}", ' ', (string) $value));
}
private function extension(string $path, ?string $originalName): string
{
$name = trim((string) $originalName);
$extension = $name !== ''
? pathinfo($name, PATHINFO_EXTENSION)
: pathinfo($path, PATHINFO_EXTENSION);
return strtolower((string) $extension);
}
/**
* @return array{0:string|null,1:string}
*/

2
app/Http/Controllers/Business/SystemizationTodos.php
View File

@ -741,6 +741,8 @@ class SystemizationTodos extends Controller
$data['source']->getRealPath(),
(int) company_id(),
user_id(),
false,
$data['source']->getClientOriginalName(),
);
} catch (Throwable $exception) {
report($exception);

47
tests/Feature/Business/SystemizationTodosTest.php
View File

@ -860,6 +860,53 @@ class SystemizationTodosTest extends FeatureTestCase
}
}
public function test_uploaded_workbook_uses_original_filename_when_temp_path_has_no_extension(): void
{
$this->loginAs();
$sourcePath = sys_get_temp_dir() . '/systemization-upload-source-' . uniqid() . '.xlsx';
$uploadPath = sys_get_temp_dir() . '/systemization-upload-' . uniqid();
try {
$this->writeWorkbook($sourcePath, [[
'收入',
'上传测试',
'浏览器上传的工作簿',
'晨曦',
'栎阳',
'2026-10-27',
'2026-10-30',
null,
null,
]]);
copy($sourcePath, $uploadPath);
$upload = new UploadedFile(
$uploadPath,
'10.19工作梳理.xlsx',
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
null,
true,
);
$this->post(route('business.systemization-todos.import'), [
'source' => $upload,
])->assertRedirect()
->assertSessionHas('success');
$this->assertDatabaseHas('business_systemization_todos', [
'company_id' => (int) company_id(),
'title' => '浏览器上传的工作簿',
]);
$this->assertDatabaseHas('business_systemization_todo_audit_logs', [
'company_id' => (int) company_id(),
'action' => 'import',
]);
} finally {
@unlink($sourcePath);
@unlink($uploadPath);
}
}
public function test_manual_changes_are_listed_in_operation_history_and_csv(): void
{
$this->loginAs();