活动导入时间格式优化2

app/Imports/EventCalendarImport.php

@@ -71,7 +71,6 @@ class EventCalendarImport implements ToModel
             $this->error[] = imports_error($this->index, 'import7');
             return ;
         }
-        $start_time = $this->excelToDateTime($start_time);
         $start_times = strtotime($start_time);
         if (!$start_times) {
             $this->error[] = imports_error($this->index, 'import8');
@@ -91,7 +90,6 @@ class EventCalendarImport implements ToModel
             $this->error[] = imports_error($this->index, 'import11');
             return ;
         }
-        $end_time = $this->excelToDateTime($end_time);
         $end_times = strtotime($end_time);
         if (!$end_times) {
             $this->error[] = imports_error($this->index, 'import12');
@@ -105,7 +103,7 @@ class EventCalendarImport implements ToModel
         $save_end_time = $end_date_time . ' ' . $end_time;
 
         // 开始时间不能大于结束时间
-        if (strtotime($save_start_time) > strtotime($save_end_time)) {
+        if (strtotime($save_start_time) >= strtotime($save_end_time)) {
             $this->error[] = imports_error($this->index, 'import13');
             return;
         }