后台修改

@@ -107,18 +107,38 @@ class MemberController extends CommentController
             ->field('o.id,o.order_sn,o.status as orderStatus,o.create_time as cre,o.update_time as up , h.id as hire_id,h.* , s.name as select_name ,m.name as member_name ')
             ->order('o.create_time desc')
             ->select()->toArray();
-        echo "<pre/>";
-        print_r($coo_list);
-        die;
         if($coo_list){
-            foreach ($coo_list as $k=>$v){
+//            查询分配表
+            $where_compare['l.status'] = array('neq',9);
+            $log = Db::name('CompareLog')->alias('l')
+                ->where($where_compare)
+                ->join("Member m",'m.id = l.resume_user_id')
+                ->field('m.name,m.tel,l.order_id')
+                ->find();
 
+            foreach ($coo_list as $k=>$v){
+                if($log){
+                    $i = 0;
+                    foreach ($log as $lk=>$lv){
+                        if($lv['order_id'] == $v['id']){
+                            $i += 1;
+                            if($i > 1){
+                                $coo_list[$k][] = $lv;
+                            }else{
+                                $coo_list[$k] = $lv;
+                            }
+                        }
+                    }
 
 
+                }
                 $coo_list[$k]['start_time'] = date('Y.m.d',strtotime($v['start_time']));
                 $coo_list[$k]['end_time'] = date('Y.m.d',strtotime($v['end_time']));
             }
         }
+        echo "<pre/>";
+        print_r($coo_list);
+        die;
         $this->apiResponse('1','成功',$coo_list);
     }