From afdcf5b30ebe1034a8fcccef78e2fb4a82f49b39 Mon Sep 17 00:00:00 2001
From: zcstatham <578322713@qq.com>
Date: Mon, 29 Aug 2022 23:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E7=AD=89=E6=97=A5=E6=9C=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=E8=B0=83=E8=AF=953?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/service/CarInfoHandle.php | 33 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/extend/service/CarInfoHandle.php b/extend/service/CarInfoHandle.php
index 51c812d..8bf6f5d 100644
--- a/extend/service/CarInfoHandle.php
+++ b/extend/service/CarInfoHandle.php
@@ -488,24 +488,23 @@ class CarInfoHandle
         $now = date('Y-m-d H:i:s');
         Db::execute('ALTER TABLE car_info_t DISABLE KEYS;');
         for ($row = 2; $row <= $highestRow; $row++) {
-            $log = $worksheet->getCellByColumnAndRow(2, $row)->getValue();
-            Log::record($log);
-            Log::record(strtotime(trim(trim($log), '"')));
-            Log::record(date('Y-m-d', strtotime(trim(trim($log), '"'))));
+            $register_date = $worksheet->getCellByColumnAndRow(2, $row)->getValue();
+            if (is_numeric($register_date))
+                $register_date = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($register_date);
             $row_array[] = [
-                'duty_no' =>  trim(trim($worksheet->getCellByColumnAndRow(1, $row)->getValue(), '"')),
-                'register_date' => date('Y-m-d', strtotime(trim(trim($worksheet->getCellByColumnAndRow(2, $row)->getValue(), '"')))),
-                'car_man' => trim(trim($worksheet->getCellByColumnAndRow(3, $row)->getValue(), '"')),
-                'car_number' => trim(trim($worksheet->getCellByColumnAndRow(4, $row)->getValue(), '"')),
-                'car_phone' => trim(trim($worksheet->getCellByColumnAndRow(5, $row)->getValue(), '"')),
-                'car_frame_no' => trim(trim($worksheet->getCellByColumnAndRow(6, $row)->getValue(), '"')),
-                'car_no' => str_replace('-', '', trim(trim($worksheet->getCellByColumnAndRow(7, $row)->getValue(), '"'))),
-                'engine_no' => trim(trim($worksheet->getCellByColumnAndRow(8, $row)->getValue(), '"')),
-                'factory_model' => trim(trim($worksheet->getCellByColumnAndRow(9, $row)->getValue(), '"')),
-                'purchase_price' => trim(trim($worksheet->getCellByColumnAndRow(10, $row)->getValue(), '"')),
-                'source' => $id,
-                'create_timestamp' => $now,
-                'update_timestamp' => $now
+                    'duty_no' => trim(trim($worksheet->getCellByColumnAndRow(1, $row)->getValue(), '"')),
+                    'register_date' => date('Y-m-d', strtotime(trim(trim($register_date, '"')))),
+                    'car_man' => trim(trim($worksheet->getCellByColumnAndRow(3, $row)->getValue(), '"')),
+                    'car_number' => trim(trim($worksheet->getCellByColumnAndRow(4, $row)->getValue(), '"')),
+                    'car_phone' => trim(trim($worksheet->getCellByColumnAndRow(5, $row)->getValue(), '"')),
+                    'car_frame_no' => trim(trim($worksheet->getCellByColumnAndRow(6, $row)->getValue(), '"')),
+                    'car_no' => str_replace('-', '', trim(trim($worksheet->getCellByColumnAndRow(7, $row)->getValue(), '"'))),
+                    'engine_no' => trim(trim($worksheet->getCellByColumnAndRow(8, $row)->getValue(), '"')),
+                    'factory_model' => trim(trim($worksheet->getCellByColumnAndRow(9, $row)->getValue(), '"')),
+                    'purchase_price' => trim(trim($worksheet->getCellByColumnAndRow(10, $row)->getValue(), '"')),
+                    'source' => $id,
+                    'create_timestamp' => $now,
+                    'update_timestamp' => $now
             ];
             if (count($row_array) > 1000) {
                 Db::name('car_info_t')->insertAll($row_array);