124

app/admin/controller/Check.php

@@ -60,19 +60,23 @@ public function list()
         $where['a.status '] = $status;
     }
     $count = Db::name('good_check')->alias('a')->join("warehouse_info b","a.wsm_code = b.wsm_code","left")
-        ->join("depart_user c","c.uid=a.apply_id","left")
-        ->join("company_item d","d.id=c.itemid","left")
         ->join("supplier v","v.code=b.supplierNo","left")
-        ->field("a.status,a.apply_id,a.apply_name,a.type,a.addtime,a.wsm_code,a.check_code,b.name,c.itemid,d.name as 'rename',a.id,v.name as 'caname',v.code")->where($where)->count();
+        ->where($where)->count();
     $total = ceil($count / $size);
     $page = $page >= $total ? $page : $total;
     $list = Db::name('good_check')->alias('a')->join("warehouse_info b","a.wsm_code = b.wsm_code","left")
-        ->join("depart_user c","c.uid=a.apply_id","left")
-        ->join("company_item d","d.id=c.itemid","left")
         ->join("supplier v","v.code=b.supplierNo","left")
-        ->field("a.status,a.apply_id,a.apply_name,a.type,a.addtime,a.wsm_code,a.check_code,b.name,c.itemid,d.name as 'rename',a.id,v.name as 'caname',v.code")
-        ->where($where)->order("addtime desc")->page($page,$size)->select();
-
+        ->field("a.status,a.apply_id,a.apply_name,a.type,a.addtime,a.wsm_code,a.check_code,b.name,a.id,v.name as 'caname',v.code")->where($where)->page($page,$size)->order("a.id desc")->select();
+    $data=[];
+    foreach ($list as $key=>$value){
+        $value['rename'] ='';
+        if($value['apply_id']!=0){
+            $depart = Db::name("depart_user")->alias("a")->leftJoin("company_item b","a.itemid = b.id")->where(['a.uid'=>$value['apply_id'],'a.is_del'=>0])
+                ->column('b.name');
+            $value['rename'] =implode(",",$depart);
+        }
+        $data[] = $value;
+    }
 
     return app_show(0,"获取成功",['count'=>$count,'list'=>$list]);
     }