Browse Source

优化2

master
wanghongjun 3 days ago
parent
commit
16ad216ad5
  1. 2
      app/Imports/ParkingLicensePlateImport.php
  2. 3
      app/Imports/ParkingPatternSpaceImport.php
  3. 3
      app/Imports/ParkingSpaceImport.php
  4. 3
      app/Imports/ParkingSpaceRepairImport.php
  5. 2
      app/Imports/ParkingVipListImport.php
  6. 3
      app/Imports/ParkingWhitelistImport.php

2
app/Imports/ParkingLicensePlateImport.php

@ -36,7 +36,7 @@ class ParkingLicensePlateImport implements ToModel
$this->index += 1; $this->index += 1;
$number = $row[1] ?? ''; $number = $row[1] ?? '';
if (empty($number)) { if (empty($number)) {
$this->error[] = imports_error($this->index, 'import33'); //$this->error[] = imports_error($this->index, 'import33');
return; return;
} }
$where = [ $where = [

3
app/Imports/ParkingPatternSpaceImport.php

@ -27,6 +27,9 @@ class ParkingPatternSpaceImport implements ToModel
return; return;
} }
$this->index += 1; $this->index += 1;
if (empty($row[1]) && empty($row[2]) && empty($row[3])) {
return;
}
if (empty($row[1])) { if (empty($row[1])) {
$this->error[] = imports_error($this->index, 'import19'); $this->error[] = imports_error($this->index, 'import19');
return; return;

3
app/Imports/ParkingSpaceImport.php

@ -37,6 +37,9 @@ class ParkingSpaceImport implements ToModel, WithChunkReading
$region = $row[3] ?? ''; $region = $row[3] ?? '';
$attr = $row[4] ?? ''; $attr = $row[4] ?? '';
$number = $row[5] ?? ''; $number = $row[5] ?? '';
if (!$parking && !$floor && !$region && !$attr && !$number) {
return;
}
if (empty($parking)) { if (empty($parking)) {
$this->error[] = imports_error($this->index, 'import20'); $this->error[] = imports_error($this->index, 'import20');
return; return;

3
app/Imports/ParkingSpaceRepairImport.php

@ -27,6 +27,9 @@ class ParkingSpaceRepairImport implements ToModel, WithChunkReading
return; return;
} }
$this->index += 1; $this->index += 1;
if (!$row[1] && !$row[2] && !$row[3] && !$row[4] && !$row[5]) {
return;
}
$space_number = $row[1] ?? ''; $space_number = $row[1] ?? '';
if (empty($space_number)) { if (empty($space_number)) {
$this->error[] = imports_error($this->index, 'import15'); $this->error[] = imports_error($this->index, 'import15');

2
app/Imports/ParkingVipListImport.php

@ -36,7 +36,7 @@ class ParkingVipListImport implements ToModel
$this->index += 1; $this->index += 1;
$license = $row[1] ?? ''; $license = $row[1] ?? '';
if (empty($license)) { if (empty($license)) {
$this->error[] = imports_error($this->index, 'import33'); //$this->error[] = imports_error($this->index, 'import33');
return; return;
} }
$license_id = (new ParkingLicensePlateService( $license_id = (new ParkingLicensePlateService(

3
app/Imports/ParkingWhitelistImport.php

@ -28,6 +28,9 @@ class ParkingWhitelistImport implements ToModel, WithChunkReading
return; return;
} }
$this->index += 1; $this->index += 1;
if (!$row[1] && !$row[2] && !$row[3] && !$row[4]) {
return;
}
$license_plate = $row[1] ?? ''; $license_plate = $row[1] ?? '';
if (empty($license_plate)) { if (empty($license_plate)) {
$this->error[] = imports_error($this->index, 'import33'); $this->error[] = imports_error($this->index, 'import33');

Loading…
Cancel
Save