前端报表竞价单导出明细优化业务员所属部门

app/admin/controller/Report.php

@@ -233,9 +233,10 @@ class Report extends Base
             ->alias('a')
             ->field('DATE_FORMAT(a.addtime,"%Y-%m-%d") addtime,cii.name,count(a.id) total')
             ->leftJoin('consult_order b', 'b.zxNo=a.zxNo')
-            ->leftJoin('company_item cii', 'cii.id=b.depart')
+            ->leftJoin('depart_user u', 'u.uid=b.saleid AND u.is_del=0')
+            ->leftJoin('company_item cii', 'cii.id=u.itemid')
             ->where($where)
-            ->group('addtime,b.depart')
+            ->group('addtime,u.itemid')
             ->order('addtime')
             ->count();
 
@@ -243,9 +244,10 @@ class Report extends Base
             ->alias('a')
             ->field('DATE_FORMAT(a.addtime,"%Y-%m-%d") addtime,cii.name,count(a.id) total')
             ->leftJoin('consult_order b', 'b.zxNo=a.zxNo')
-            ->leftJoin('company_item cii', 'cii.id=b.depart')
+            ->leftJoin('depart_user u', 'u.uid=b.saleid AND u.is_del=0')
+            ->leftJoin('company_item cii', 'cii.id=u.itemid')
             ->where($where)
-            ->group('addtime,b.depart')
+            ->group('addtime,u.itemid')
             ->order('addtime', 'desc')
             ->page($param['page'], $param['size'])
             ->select()
@@ -932,7 +934,7 @@ class Report extends Base
 
         $list = [];
 
-        $tmp=[];
+        $tmp = [];
 
         foreach ($data as $v) {
 
@@ -951,8 +953,8 @@ class Report extends Base
 
             $v['创建人'] = isset($temp['apply_name']) ? $temp['apply_name'] : '';
 
-            if(!isset($tmp[$temp['apply_id'] ?? 0])){
-                $tmp[$temp['apply_id'] ?? 0] =  get_company_name_by_uid($temp['apply_id'] ?? 0);
+            if (!isset($tmp[$temp['apply_id'] ?? 0])) {
+                $tmp[$temp['apply_id'] ?? 0] = get_company_name_by_uid($temp['apply_id'] ?? 0);
             }
             $v['创建人所属部门'] = $tmp[$temp['apply_id'] ?? 0];//get_company_name_by_uid($temp['apply_id'] ?? 0);
 
@@ -962,8 +964,8 @@ class Report extends Base
                 ->order('addtime', 'desc')
                 ->value('addtime');
 
-            if(!isset($tmp[$v['cgder_id'] ?? 0])){
-                $tmp[$v['cgder_id'] ?? 0] =  get_company_name_by_uid($v['cgder_id'] ?? 0);
+            if (!isset($tmp[$v['cgder_id'] ?? 0])) {
+                $tmp[$v['cgder_id'] ?? 0] = get_company_name_by_uid($v['cgder_id'] ?? 0);
             }
             $v['采购员所属部门'] = $tmp[$v['cgder_id'] ?? 0];//get_company_name_by_uid($v['cgder_id'] ?? 0);
 

app/admin/controller/SaleReport.php

@@ -839,7 +839,8 @@ class SaleReport extends Base
             ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo AND cb.is_del=0')
             ->leftJoin('sale s', 's.zxNo=cb.bidNo AND s.is_del=0')
             ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
-            ->leftJoin('company_item item', 'item.id=co.depart')
+            ->leftJoin('depart_user du', 'du.uid=co.saleid AND du.is_del=0')
+            ->leftJoin('company_item item', 'item.id=du.itemid')
             ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
             ->leftJoin('brand b', 'b.id=ci.brand_id')
             ->leftJoin('unit u', 'u.id=ci.unit')
@@ -853,7 +854,8 @@ class SaleReport extends Base
             ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo AND cb.is_del=0')
             ->leftJoin('sale s', 's.zxNo=cb.bidNo AND s.is_del=0')
             ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
-            ->leftJoin('company_item item', 'item.id=co.depart')
+            ->leftJoin('depart_user du', 'du.uid=co.saleid AND du.is_del=0')
+            ->leftJoin('company_item item', 'item.id=du.itemid')
             ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
             ->leftJoin('brand b', 'b.id=ci.brand_id')
             ->leftJoin('unit u', 'u.id=ci.unit')
@@ -903,7 +905,8 @@ class SaleReport extends Base
             ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo AND cb.is_del=0')
             ->leftJoin('sale s', 's.zxNo=cb.bidNo AND s.is_del=0')
             ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
-            ->leftJoin('company_item item', 'item.id=co.depart')
+            ->leftJoin('depart_user du', 'du.uid=co.saleid AND du.is_del=0')
+            ->leftJoin('company_item item', 'item.id=du.itemid')
             ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
             ->leftJoin('brand b', 'b.id=ci.brand_id')
             ->leftJoin('unit u', 'u.id=ci.unit')
@@ -1730,7 +1733,8 @@ class SaleReport extends Base
         $data = Db::name('sale')
             ->alias('a')
             ->field('a.orderCode 订单编号,a.order_type 订单类型,a.good_code 商品成本编码,a.skuCode 商品上线编码,a.good_name 商品名称,a.good_num 购买数量,a.send_num 已发货数量,a.wsend_num 未发货数量,a.status 订单状态,u.nickname 申请人名称,ci.name 申请人所属部门,(a.good_num - SUM(IFNULL(b.receipt_quantity,0)) ) as  无地址数量,"" 采购员')
-            ->leftJoin("order_addr b", "b.orderCode=a.orderCode AND b.is_del=0")->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0 AND u.status=1")
+            ->leftJoin("order_addr b", "b.orderCode=a.orderCode AND b.is_del=0")
+            ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0 AND u.status=1")
             ->leftJoin("company_item ci", "ci.id=u.itemid")
             ->where($where)
             ->group('a.id,a.orderCode,a.order_type,a.good_code,a.skuCode,a.good_name,a.good_num,a.send_num,a.wsend_num,a.status,u.nickname,ci.name,b.orderCode')
@@ -1741,7 +1745,8 @@ class SaleReport extends Base
         $cgd_sql = Db::name('sale')
             ->alias('a')
             ->field('a.orderCode')
-            ->leftJoin("order_addr b", "b.orderCode=a.orderCode AND b.is_del=0")->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0 AND u.status=1")
+            ->leftJoin("order_addr b", "b.orderCode=a.orderCode AND b.is_del=0")
+            ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0 AND u.status=1")
             ->leftJoin("company_item ci", "ci.id=u.itemid")
             ->where($where)
             ->order("a.addtime desc")