From 16ad216ad5c3037a77c1f2a7e3c6cbfaa9f9b668 Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq.com> Date: Thu, 18 Jun 2026 17:27:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Imports/ParkingLicensePlateImport.php | 2 +- app/Imports/ParkingPatternSpaceImport.php | 3 +++ app/Imports/ParkingSpaceImport.php | 3 +++ app/Imports/ParkingSpaceRepairImport.php | 3 +++ app/Imports/ParkingVipListImport.php | 2 +- app/Imports/ParkingWhitelistImport.php | 3 +++ 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/Imports/ParkingLicensePlateImport.php b/app/Imports/ParkingLicensePlateImport.php index c345745..769549a 100644 --- a/app/Imports/ParkingLicensePlateImport.php +++ b/app/Imports/ParkingLicensePlateImport.php @@ -36,7 +36,7 @@ class ParkingLicensePlateImport implements ToModel $this->index += 1; $number = $row[1] ?? ''; if (empty($number)) { - $this->error[] = imports_error($this->index, 'import33'); + //$this->error[] = imports_error($this->index, 'import33'); return; } $where = [ diff --git a/app/Imports/ParkingPatternSpaceImport.php b/app/Imports/ParkingPatternSpaceImport.php index fb856b7..49546e8 100644 --- a/app/Imports/ParkingPatternSpaceImport.php +++ b/app/Imports/ParkingPatternSpaceImport.php @@ -27,6 +27,9 @@ class ParkingPatternSpaceImport implements ToModel return; } $this->index += 1; + if (empty($row[1]) && empty($row[2]) && empty($row[3])) { + return; + } if (empty($row[1])) { $this->error[] = imports_error($this->index, 'import19'); return; diff --git a/app/Imports/ParkingSpaceImport.php b/app/Imports/ParkingSpaceImport.php index 20ee0bc..695a36f 100644 --- a/app/Imports/ParkingSpaceImport.php +++ b/app/Imports/ParkingSpaceImport.php @@ -37,6 +37,9 @@ class ParkingSpaceImport implements ToModel, WithChunkReading $region = $row[3] ?? ''; $attr = $row[4] ?? ''; $number = $row[5] ?? ''; + if (!$parking && !$floor && !$region && !$attr && !$number) { + return; + } if (empty($parking)) { $this->error[] = imports_error($this->index, 'import20'); return; diff --git a/app/Imports/ParkingSpaceRepairImport.php b/app/Imports/ParkingSpaceRepairImport.php index d09ae4a..09f3142 100644 --- a/app/Imports/ParkingSpaceRepairImport.php +++ b/app/Imports/ParkingSpaceRepairImport.php @@ -27,6 +27,9 @@ class ParkingSpaceRepairImport implements ToModel, WithChunkReading return; } $this->index += 1; + if (!$row[1] && !$row[2] && !$row[3] && !$row[4] && !$row[5]) { + return; + } $space_number = $row[1] ?? ''; if (empty($space_number)) { $this->error[] = imports_error($this->index, 'import15'); diff --git a/app/Imports/ParkingVipListImport.php b/app/Imports/ParkingVipListImport.php index e7f7161..374c4e2 100644 --- a/app/Imports/ParkingVipListImport.php +++ b/app/Imports/ParkingVipListImport.php @@ -36,7 +36,7 @@ class ParkingVipListImport implements ToModel $this->index += 1; $license = $row[1] ?? ''; if (empty($license)) { - $this->error[] = imports_error($this->index, 'import33'); + //$this->error[] = imports_error($this->index, 'import33'); return; } $license_id = (new ParkingLicensePlateService( diff --git a/app/Imports/ParkingWhitelistImport.php b/app/Imports/ParkingWhitelistImport.php index f8f344d..49a5af8 100644 --- a/app/Imports/ParkingWhitelistImport.php +++ b/app/Imports/ParkingWhitelistImport.php @@ -28,6 +28,9 @@ class ParkingWhitelistImport implements ToModel, WithChunkReading return; } $this->index += 1; + if (!$row[1] && !$row[2] && !$row[3] && !$row[4]) { + return; + } $license_plate = $row[1] ?? ''; if (empty($license_plate)) { $this->error[] = imports_error($this->index, 'import33');