wugg 3 years ago
parent
commit
ca6ceb4841
2 changed files with 16 additions and 11 deletions
  1. 5 0
      app/admin/controller/Consult.php
  2. 11 11
      app/admin/controller/Project.php

+ 5 - 0
app/admin/controller/Consult.php

@@ -1137,6 +1137,11 @@ class Consult extends Base
         if ($bidNo !== "") {
             $where[] = ['bidNo','=',$bidNo];
         }
+        $pgNo = isset($this->post['pgNo']) && $this->post['pgNo'] !== "" ? trim($this->post['pgNo']) : "";
+        if ($pgNo !== "") {
+            $bidinfo = Db::name("consult_info")->where([["pgNo","=",$pgNo],["is_del","=",0]])->column("infoNo");
+            $where[] = ['infoNo','in',$bidinfo];
+        }
         $projectNo = isset($this->post['projectNo']) && $this->post['projectNo'] !== "" ? trim($this->post['projectNo']) : "";
         if ($projectNo !== "") {
             $zxlist = Db::name("consult_order")->where(["projectNo"=>$projectNo,"is_del"=>0,"is_project"=>1])->column

+ 11 - 11
app/admin/controller/Project.php

@@ -306,18 +306,18 @@ class Project extends Base
                 array_walk($feedback,function (&$v){
                     $v["cat_info"]=isset($v['cat_id'])? made($v['cat_id'],[]):[];
                 });
-                $zx = Db::name("consult_info")->where(["pgNo"=>$value["pgNo"],"is_del"=>0,"bargain_status"=>0])
-                    ->column("infoNo");
-                if(!empty($zx)){
-                    $zxback = Db::name("consult_bids")->where(["infoNo"=>$zx,"is_del"=>0])->select()->toArray();
-                    array_walk($zxback,function (&$v){
-                        $v["cat_info"]=isset($v['cat_id'])? made($v['cat_id'],[]):[];
-                    });
-                }else{
-                    $zxback=[];
-                }
+//                $zx = Db::name("consult_info")->where(["pgNo"=>$value["pgNo"],"is_del"=>0,"bargain_status"=>0])
+//                    ->column("infoNo");
+//                if(!empty($zx)){
+//                    $zxback = Db::name("consult_bids")->where(["infoNo"=>$zx,"is_del"=>0])->select()->toArray();
+//                    array_walk($zxback,function (&$v){
+//                        $v["cat_info"]=isset($v['cat_id'])? made($v['cat_id'],[]):[];
+//                    });
+//                }else{
+//                    $zxback=[];
+//                }
                 $value['feedback']=$feedback;
-                $value['zxback']=$zxback;
+               // $value['zxback']=$zxback;
                 $info['ladder'][]=$value;
             }
         }