1

application/service/queue/ImportTable2Queue.php

@@ -58,8 +58,6 @@ class ImportTable2Queue
             $kd_array = Db::name('system_kd')->column('name');
             //循环从第二行开始，第一行往往是表头
             $insert_array = array();
-            $deal_count = 0;
-            $max = $maxRow-1;
             for($i=2;$i<=$maxRow;$i++)
             {
                 $a = [];
@@ -96,20 +94,14 @@ class ImportTable2Queue
                 $a['date'] = $date;
                 array_push($insert_array,$a);
                 $count = count($insert_array);
-                if (($max/$deal_count)>=1){
-                    if ($count>='5000'){
-                        Db::name('system_table2')->insertAll($insert_array);
-                        Db::name('system_queue')->where('id',$info['id'])->setInc('deal_count',$count);
-                        $deal_count +=$count;
-                        $insert_array = array();
-                    }
-                }else{
+                if ($count>='5000'){
                     Db::name('system_table2')->insertAll($insert_array);
                     Db::name('system_queue')->where('id',$info['id'])->setInc('deal_count',$count);
-                    $deal_count +=$count;
                     $insert_array = array();
                 }
             }
+            Db::name('system_table2')->insertAll($insert_array);
+            Db::name('system_queue')->where('id',$info['id'])->setInc('deal_count',$count);
 
             $names = Db::name('system_table2')->where('import_log_id',$info['id'])->where('name','neq','')->group('name')->column('name');
             if ($names){