添加还原

application/admin/controller/lottery/Lottery.php

@@ -35,6 +35,13 @@ class Lottery extends Backend
 
     //过滤
     public function filter($ids = null){
+        $restore = $this->request->get("restore");
+        if(isset($restore) && $restore ==1 ){
+            
+            $deletetime = null;
+        }else{
+            $deletetime = time();
+        }
         $row = $this->model->get($ids);
         if (!$row) {
             $this->error(__('No Results were found'));
@@ -52,13 +59,14 @@ class Lottery extends Backend
         }
 
         $tickets = new \app\admin\model\lottery\Tickets;
+        $tickets = $tickets->withTrashed();//包含软连的数据
 
         // 构建五个字段数组
         $fieldsAll = array("t1", "t2", "t3", "t4", "t5");
         $where5 = array_combine($fieldsAll,$arr);
 
         //先去掉 5个的
-        $tickets->where($where5)->update(['deletetime'=>time()]);
+        $tickets->where($where5)->update(['deletetime'=>$deletetime]);
         //echo $tickets->getLastsql()."</br>";
 
         //print_r($where);exit;
@@ -70,7 +78,7 @@ class Lottery extends Backend
                 $temp = $arr;
                 unset($temp[$k2]);
                 $where4 = array_combine($fields,$temp);
-                $tickets->where($where4)->update(['deletetime'=>time()]);
+                $tickets->where($where4)->update(['deletetime'=>$deletetime]);
                 //echo $tickets->getLastsql()."</br>";
                 $where4 = [];
             }
@@ -93,7 +101,7 @@ foreach ($fieldsAll as $i => $key) {
                             $key3 => $v3
                         );
                         //$results[] = $where3;
-                        $tickets->where($where3)->update(['deletetime'=>time()]);
+                        $tickets->where($where3)->update(['deletetime'=>$deletetime]);
                         //echo $tickets->getLastsql()."</br>";
                     }
                 }
@@ -101,7 +109,7 @@ foreach ($fieldsAll as $i => $key) {
         }
     }
 }     
-    $this->success("成功过滤掉--".$row['title'].'--号码！');
+    $this->success("成功处理--".$row['title'].'--号码！');
     }
 
 }

public/assets/js/backend/lottery/lottery.js

@@ -40,10 +40,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     name: 'filter',
                                     text: '过滤',
                                     classname: 'btn btn-xs btn-info btn-ajax',
-                                    icon: 'fa fa-rotate-left',
+                                    icon: 'fa fa-rotate-right',
                                     url: 'lottery/lottery/filter?ids={id}',
                                     refresh: true
-                                }  
+                                },
+                                {
+                                    name: 'Restore',
+                                    text: '还原',
+                                    classname: 'btn btn-xs btn-info btn-ajax',
+                                    icon: 'fa fa-rotate-left',
+                                    url: 'lottery/lottery/filter?ids={id}&restore=1',
+                                    refresh: true
+                                }    
                             ],
                             formatter: Table.api.formatter.operate
                         }