Browse Source

活动模式、维修导入日期优化、模式导出样本优化

master
wanghongjun 3 weeks ago
parent
commit
bf3ff010a2
  1. 4
      app/Exports/ParkingPatternModelExport.php
  2. 12
      app/Imports/EventCalendarImport.php
  3. 13
      app/Imports/ParkingSpaceRepairImport.php

4
app/Exports/ParkingPatternModelExport.php

@ -14,9 +14,7 @@ class ParkingPatternModelExport implements FromArray
__exports('parking_pattern.parking_space_number'),
__exports('parking_pattern.parking_space_type')
],
['1', 'A0001', __exports('default.export2')],
['2', 'A0002', __exports('default.export2')],
['3', 'A0003', __exports('default.export2')],
['1', 'A0001', __exports('default.export2')]
];
}
}

12
app/Imports/EventCalendarImport.php

@ -8,6 +8,7 @@ use App\Services\AdminTranslationService;
use App\Services\EventCalendarService;
use App\Services\OperationLogService;
use Maatwebsite\Excel\Concerns\ToModel;
use PhpOffice\PhpSpreadsheet\Shared\Date;
class EventCalendarImport implements ToModel
{
@ -60,6 +61,7 @@ class EventCalendarImport implements ToModel
$this->error[] = imports_error($this->index, 'import5');
return ;
}
$start_date = $this->excelToDateTime($start_date);
$start_date_times = strtotime($start_date);
if (!$start_date_times) {
$this->error[] = imports_error($this->index, 'import6');
@ -78,6 +80,7 @@ class EventCalendarImport implements ToModel
$this->error[] = imports_error($this->index, 'import9');
return ;
}
$end_date = $this->excelToDateTime($end_date);
$end_date_times = strtotime($end_date);
if (!$end_date_times) {
$this->error[] = imports_error($this->index, 'import10');
@ -150,4 +153,13 @@ class EventCalendarImport implements ToModel
{
return $this->error;
}
protected function excelToDateTime($date): string
{
if (is_numeric($date)) {
$dateTime = Date::excelToDateTimeObject($date);
return $dateTime->format('Y-m-d');
}
return $date;
}
}

13
app/Imports/ParkingSpaceRepairImport.php

@ -2,12 +2,12 @@
namespace App\Imports;
use App\Models\Parking;
use App\Models\ParkingSpace;
use App\Services\OperationLogService;
use App\Services\ParkingSpaceRepairService;
use Maatwebsite\Excel\Concerns\ToModel;
use Maatwebsite\Excel\Concerns\WithChunkReading;
use PhpOffice\PhpSpreadsheet\Shared\Date;
class ParkingSpaceRepairImport implements ToModel, WithChunkReading
{
@ -50,12 +50,14 @@ class ParkingSpaceRepairImport implements ToModel, WithChunkReading
$this->error[] = imports_error($this->index, 'import29');
return;
}
$start_at = $this->excelToDateTime($start_at);
$start_times = strtotime($start_at);
if (!$start_times) {
$this->error[] = imports_error($this->index, 'import30');
return;
}
$end_at = $row[5] ?? '';
$end_at = $this->excelToDateTime($end_at);
$end_times = strtotime($end_at);
if (empty($end_at)) {
$this->error[] = imports_error($this->index, 'import31');
@ -96,4 +98,13 @@ class ParkingSpaceRepairImport implements ToModel, WithChunkReading
{
return $this->error;
}
protected function excelToDateTime($date): string
{
if (is_numeric($date)) {
$dateTime = Date::excelToDateTimeObject($date);
return $dateTime->format('Y-m-d H:i:s');
}
return $date;
}
}

Loading…
Cancel
Save