Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -63,12 +63,11 @@ class ProjectImport extends Command
             return true;
             return true;
         }
         }
 
 
-        dd($line_of_text);
         $success_count = 0;  //成功导入条数
         $success_count = 0;  //成功导入条数
-        $count_line = count($line_of_text) - 1; //总条数
-        if ($count_line > 0) {
+        $count_line = count($line_of_text); //总条数
+        if ($count_line > 1) {
             $task->status = ImportTask::STATUS_ING;//导入中
             $task->status = ImportTask::STATUS_ING;//导入中
-            $task->total_count = $count_line;
+            $task->total_count = $count_line - 1;
             $task->save();
             $task->save();
 
 
             //设置数据库
             //设置数据库
@@ -92,7 +91,7 @@ class ProjectImport extends Command
         $task->success_count = $success_count;
         $task->success_count = $success_count;
         $task->save();
         $task->save();
 
 
-        echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import end, total count: ' . $count_line . ', success count: ' . $success_count . PHP_EOL;
+        echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import end, total count: ' . ($count_line - 1) . ', success count: ' . $success_count . PHP_EOL;
 
 
         sleep(2);
         sleep(2);
     }
     }