Browse Source

全局处理GetPart方法,第三阶段

wufeng 2 years ago
parent
commit
021ab7939b

+ 12 - 5
app/abutment/controller/Consult.php

@@ -2,6 +2,7 @@
 
 namespace app\abutment\controller;
 
+use app\admin\common\User;
 use app\admin\model\ActionLog;
 use app\admin\model\ProcessOrder;
 use think\facade\Db;
@@ -162,7 +163,9 @@ class Consult extends HomeBaseController
             $zxinfo['pgNo'] = isset($projectinfo['pgNo']) ? $projectinfo['pgNo'] : "";
         }
         if ($zxorder['depart'] > 0) {
-            $zxinfo['departinfo'] = GetPart($zxorder['depart']);
+            $userCommon = new User();
+            $rs = $userCommon->handle('ciinfo', ['id' => $zxorder['depart']]);
+            $zxinfo['departinfo'] = $rs['data'] ?? [];
         }
         if ($zxorder['platform_code'] > 0) {
             $palt = Db::name("platform")->where(["id" => $zxorder['platform_code']])->find();
@@ -549,13 +552,17 @@ class Consult extends HomeBaseController
         $page = $page >= $total ? $total : $page;
         $list = Db::name('consult_bids')
             ->alias('cb')
-            ->field('cb.*,u.itemid')
-            ->leftJoin("depart_user u", "u.uid=cb.createrid AND u.is_del=0")
+            ->field('cb.*')
             ->leftJoin("consult_info c", "c.infoNo=cb.infoNo")
             ->where($where)
             ->page($page, $size)
             ->order('cb.addtime', 'desc')
-            ->cursor();
+            ->select()
+            ->toArray();
+
+        $all_createrid = array_column($list,'createrid');
+        $item = get_company_name_by_uid($all_createrid);
+
         $data = [];
         foreach ($list as $value) {
             $catinfo = Db::name("cat")->where(["id" => $value['cat_id']])->find();
@@ -624,7 +631,7 @@ class Consult extends HomeBaseController
 //                $addr= GetAddr(json_encode($temp));
 //                $value['origin_addr'] = $addr;
 //            }
-            $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
+            $value['company_name'] = $item[$value['createrid']] ?? '';
             $data[] = $value;
         }
         return json_show(0, "获取成功", ['count' => $count, 'list' => $data]);

+ 12 - 7
app/abutment/controller/Good.php

@@ -143,13 +143,15 @@ class Good extends HomeBaseController
         $page = $page >= $total ? $total : $page;
         $list = Db::name('good_basic')
             ->alias('gb')
-            ->field('gb.*,u.itemid')
-            ->leftJoin("depart_user u", "u.uid=gb.chargerid AND u.is_del=0")
             ->where($where)
             ->page($page, $size)
             ->order("addtime desc")
             ->select()
             ->toArray();
+
+        $all_createrid = array_column($list,'chargerid');
+        $item = get_company_name_by_uid($all_createrid);
+
         $data = [];
 
         //查询一下这些spucode是否在平台上成功上线
@@ -178,7 +180,7 @@ class Good extends HomeBaseController
             //如果一个spucode在任意平台上线,那么就视为它上线,即手动把它的is_online值改为1
             if (isset($exam_statuss[$value['spuCode']]) || isset($exam_status_yz[$value['spuCode']])) $value['is_online'] = 1;
 
-            $value['charger_company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
+            $value['charger_company_name'] = $item[$value['chargerid']]??'';
 
             $data[] = $value;
         }
@@ -1510,14 +1512,17 @@ class Good extends HomeBaseController
         $where[] = ['g.id', 'in', $ids];
         $list = Db::name("gold_price1")
             ->alias('g')
-            ->field('g.*,u.itemid')
-            ->leftJoin("depart_user u", "u.uid=g.action_id AND u.is_del=0")
             ->where($where)
-            ->cursor();
+            ->select()
+            ->toArray();
+
+        $all_createrid = array_column($list,'action_id');
+        $item = get_company_name_by_uid($all_createrid);
+
         $data = [];
         foreach ($list as $value) {
             $value['type_cn'] = $this->gold[$value['type']];
-            $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
+            $value['company_name'] = $item[$value['action_id']]??'';
             $data[] = $value;
         }
         return json_show(0, "获取成功", $data);

+ 16 - 12
app/abutment/controller/Index.php

@@ -89,17 +89,19 @@ class Index extends HomeBaseController
         $page = $page >= $total ? $total : $page;
         $list = Db::name('brand')
             ->alias('b')
-            ->field('b.*,u.itemid')
-            ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
             ->where($where)
-            ->append(['company_name'])
-            ->withAttr('company_name', function ($val, $data) {
-                return implode('/', array_column(GetPart($data['itemid']), 'name'));
-            })
             ->page($page, $size)
             ->order("addtime desc,id desc")
             ->select()
             ->toArray();
+
+        $all_createrid = array_column($list,'createrid');
+        $item = get_company_name_by_uid($all_createrid);
+
+        foreach ($list as &$value){
+            $value['company_name']=$item[$value['createrid']]??'';
+        }
+
         return json_show(0, "获取成功", ['list' => $list, 'count' => $count]);
     }
 
@@ -207,16 +209,18 @@ class Index extends HomeBaseController
             ->alias('b')
             ->where($where)
             ->page($page, $size)
-            ->field("b.id,b.company,b.companyNo,b.status,b.creater,b.addtime,b.type,u.itemid")
-            ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
+            ->field("b.id,b.company,b.companyNo,b.status,b.creater,b.addtime,b.type")
             ->order("addtime desc")
-            ->append(['company_name'])
-            ->withAttr('company_name', function ($val, $data) {
-                return implode('/', array_column(GetPart($data['itemid']), 'name'));
-            })
             ->select()
             ->toArray();
 
+        $all_createrid = array_column($list, 'createrid');
+        $item = get_company_name_by_uid($all_createrid);
+
+        foreach ($list as &$value) {
+            $value['company_name'] = $item[$value['createrid']] ?? '';
+        }
+
         return json_show(0, "获取成功", ['list' => $list, 'count' => $count]);
     }
 

+ 7 - 4
app/abutment/controller/Order.php

@@ -134,15 +134,18 @@ class Order extends HomeBaseController
             ->alias('po')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
             ->leftJoin('sale s', 's.orderCode=on.orderCode')
-            ->leftJoin("depart_user u", "u.uid=po.cgder_id AND u.is_del=0")
-            ->field('po.*,on.orderCode,u.itemid')
+            ->field('po.*,on.orderCode')
             ->where($where)
             ->where(function ($query) use ($where) {
                 $query->whereOr([['po.order_type', '<>', 1], ['po.order_source', '=', 0]]);
             })
             ->page($page, $size)
             ->order("po.addtime desc")
-            ->cursor();
+            ->select()
+            ->toArray();
+
+        $all_createrid = array_column($list,'cgder_id');
+        $item = get_company_name_by_uid($all_createrid);
 
         $data = [];
         foreach ($list as $value) {
@@ -193,7 +196,7 @@ class Order extends HomeBaseController
             $value['total_fee'] = round($value['total_fee'] - $value['th_fee'], 2);
             //补充orderCode
 //            $value['orderCode']=isset($all_orderCodes[$value['cgdNo']])?$all_orderCodes[$value['cgdNo']]:'';
-            $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
+            $value['company_name'] = $item[$value['cgder_id']]??'';
             $data[] = $value;
         }
         return json_show(0, "获取成功", ["list" => $data, "count" => $count]);

+ 6 - 3
app/abutment/controller/Sale.php

@@ -108,13 +108,16 @@ class Sale extends HomeBaseController
             ->join("warehouse_info n", "n.wsm_code=a.wsm_code AND n.is_del=0", "left")
             ->leftJoin("order_send os", "os.outCode=a.outCode")
             ->leftJoin("purchease_order wpo", "wpo.cgdNo=os.cgdNo")
-            ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
             ->field("a.*,b.order_type,b.order_source,b.good_name,b.good_code,b.skuCode,b.supplierNo,b.customer_code,v.companyName,b.origin_price,b.sale_price,b.total_price,os.cgdNo,u.itemid")
             ->where($where)
 //            ->where($condition)
             ->order("addtime desc")
             ->page($page, $size)
-            ->cursor();
+            ->select()
+            ->toArray();
+
+        $all_createrid = array_column($list,'apply_id');
+        $item = get_company_name_by_uid($all_createrid);
 
         $data = [];
         foreach ($list as $value) {
@@ -141,7 +144,7 @@ class Sale extends HomeBaseController
             $value['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
             $value['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
             $value['can'] = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
-            $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
+            $value['company_name'] = $item[$value['apply_id']]??'';
             $value['sendtime'] = $value['status'] < 2 ? '' : $value['sendtime'];
             $data[] = $value;
         }

+ 11 - 5
app/txx/controller/Good.php

@@ -494,7 +494,10 @@ class Good extends BaseController
             ->where($where)
             ->page(intval($param['page']),intval($param['size']))
             ->order("b.addtime desc")
-            ->cursor();
+            ->select()
+            ->toArray();
+        $all_createrid = array_column($list,'purchase_id');
+        $item = get_company_name_by_uid($all_createrid);
         $data = [];
         $yzgood = new YzGood();
         foreach ($list as $value) {
@@ -534,8 +537,8 @@ class Good extends BaseController
             $value['stock_total'] = Db::name("good_stock")->where(['spuCode' => $value['spuCode'], "is_del" => 0])->sum("usable_stock");
             $value['exclusive'] = makeExcluse($value['is_exclusive']);
             $value['noble_name'] = isset($value['noble_metal']) && $value['noble_metal'] != 0 ? $this->noble[$value['noble_metal']] : "";
-            $itemid =Db::name("depart_user")->where(["uid"=>$value["purchase_id"],"is_del"=>0])->value("itemid",'');
-            $value['company_name'] = implode('/', array_column(GetPart($itemid), 'name'));
+//            $itemid =Db::name("depart_user")->where(["uid"=>$value["purchase_id"],"is_del"=>0])->value("itemid",'');
+            $value['company_name'] = $item[$value['purchase_id']]??'';
         	}else{
             	unset($value['brand_id']);
 			unset($value['good_unit']);
@@ -611,8 +614,11 @@ class Good extends BaseController
             $info['stock_total'] = Db::name("good_stock")->where(['spuCode' => $info['spuCode'], "is_del" => 0])->sum("usable_stock");
             $info['exclusive'] = makeExcluse($info['is_exclusive']);
             $info['noble_name'] = isset($info['noble_metal']) && $info['noble_metal'] != 0 ? $this->noble[$info['noble_metal']] : "";
-            $itemid =Db::name("depart_user")->where(["uid"=>$info["purchase_id"],"is_del"=>0])->value("itemid",'');
-            $info['company_name'] = implode('/', array_column(GetPart($itemid), 'name'));
+//            $itemid =Db::name("depart_user")->where(["uid"=>$info["purchase_id"],"is_del"=>0])->value("itemid",'');
+
+            $item = get_company_name_by_uid($info["purchase_id"]);
+            $info['company_name'] = $item??'';
+
         	}else{
 	    	unset($info['brand_id']);
 		    unset($info['good_unit']);