后台问卷调查

@@ -62,8 +62,6 @@ class LoadController extends HomeBaseController
             $where['o.status'] = ['eq',2];
             $where['o.status'] = ['eq',2];
             $whereor = "o.status = 2 or (o.status = 1 and o.order_expire_time < $time and o.order_about_time < ".($time-24*30*60*60).") or (o.status = 3 and o.order_expire_time < $time) or (o.status = 3 and o.order_about_time < ".($time-24*30*60*60).")";
             $whereor = "o.status = 2 or (o.status = 1 and o.order_expire_time < $time and o.order_about_time < ".($time-24*30*60*60).") or (o.status = 3 and o.order_expire_time < $time) or (o.status = 3 and o.order_about_time < ".($time-24*30*60*60).")";
             $data = $orderInfoModel->selectData1($where,$whereor);
             $data = $orderInfoModel->selectData1($where,$whereor);
-            dump($data);
-            exit();
             foreach($data as $key1 => $vo){
             foreach($data as $key1 => $vo){
                 //判断是否已经发送
                 //判断是否已经发送
                 $send_vice = Db::name('send_vice')->where(array('order_id'=>$vo['o_id'],'collocation_id'=>$vo['id'],'time'=>$vo['order_about_time'],'type'=>2))->find();
                 $send_vice = Db::name('send_vice')->where(array('order_id'=>$vo['o_id'],'collocation_id'=>$vo['id'],'time'=>$vo['order_about_time'],'type'=>2))->find();

@@ -41,10 +41,10 @@ class OrderInfoModel extends Model
             ->where($where1)
             ->where($where1)
             ->whereOr($whereor)
             ->whereOr($whereor)
             ->order('c.create_time','desc')
             ->order('c.create_time','desc')
-            ->fetchSql()
-            ->select();//->toArray();
-        echo $data;
-        exit();
+//            ->fetchSql()
+            ->select()->toArray();
+//        echo $data;
+//        exit();
         return $data;
         return $data;
     }
     }
     public function selectData($where1,$whereor=null){
     public function selectData($where1,$whereor=null){