1

application/admin/controller/Queue.php

@@ -176,6 +176,30 @@ class Queue extends Controller
     public function redo()
     {
         $id = $this->request->get('id');
+        try {
+            $queue = Db::name('system_queue')->where('id',$id)->find();
+            if ($queue['deal_count']>0){
+                Db::name('system_queue')->where('id',$id)->update(
+                    [
+                        'deal_count'=>0,
+                    ]
+                );
+            }
+            if ($queue['type']==1){
+                Db::name('system_values')->where('import_log_id',$id)->delete();
+                Db::commit();
+            }else{
+                Db::name('system_table2')->where('import_log_id',$id)->delete();
+                Db::name('system_values2')->where('import_log_id',$id)->delete();
+                Db::name('system_values3')->where('import_log_id',$id)->delete();
+                Db::commit();
+            }
+        }catch (\think\exception\ValidateException $e) {
+            Db::rollback();
+            sysoplog('上传记录', '重置任务ID:'.$id.'失败');
+            $this->error('重置任务失败');
+        }
+
         $queue = Db::name($this->table)->where('id',$id)->find();
         $info = Db::name($this->table)->where('type',$queue['type'])->whereIn('status','1,2')->count();
         if ($info){