数据大屏今日订单数据优化

app/admin/controller/Data.php

@@ -310,9 +310,7 @@ class Data extends BaseController
             ->leftJoin('company_item c', 'c.id=t.itemid')
             ->group('t.itemid')
             ->order('total_price', 'desc')
-//            ->limit(3)
-            ->select()
-            ->toArray();
+            ->column('itemid companyId,c.`name` companyName,SUM(t.total_price) total_price,COUNT(t.id) total_order', 'name');
 
         //跨库添加网络部数据
         $internet = Db::connect('mysql3')
@@ -323,12 +321,17 @@ class Data extends BaseController
             ->find();
 
         if (!empty($internet)) {
-            $rs[] = [
-                'companyId' => '',
-                'companyName' => '网络部',
-                'total_price' => $internet['total_price'],
-                'total_order' => $internet['total_order'],
-            ];
+            if (isset($rs['网络部'])) {
+                $rs['网络部']['total_price'] += $internet['total_price'];
+                $rs['网络部']['total_order'] += $internet['total_order'];
+            } else {
+                $rs[] = [
+                    'companyId' => '',
+                    'companyName' => '网络部',
+                    'total_price' => $internet['total_price'],
+                    'total_order' => $internet['total_order'],
+                ];
+            }
 
             //重新按照总金额排序
             usort($rs, function ($left, $right) {
@@ -337,7 +340,6 @@ class Data extends BaseController
 
         }
 
-
         return app_show(0, '请求成功', $rs);
 
     }

app/admin/controller/Report.php

@@ -419,7 +419,7 @@ class Report extends Base
         if (!empty($param['zxNo'])) $where[] = ['cb.zxNo', 'in', $param['zxNo']];
 
 
-        $total = Db::name('consult_bids')
+        $count = Db::name('consult_bids')
             ->alias('cb')
             ->where($where)
             ->count('cb.id');
@@ -456,7 +456,7 @@ class Report extends Base
             'companyName' => '',
         ];
 
-        return app_show(0, '请求成功', ['list' => $data, 'total' => $total]);
+        return app_show(0, '请求成功', ['list' => $data, 'count' => $count]);
 
 
     }
@@ -529,7 +529,7 @@ class Report extends Base
         if ($param['companyName'] != '') $where[] = ['csi.companyName', 'like', '%' . $param['companyName'] . '%'];
 
 
-        $total = Db::name('consult_bids')
+        $count = Db::name('consult_bids')
             ->alias('cb')
             ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo AND ci.is_del=0')
             ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo AND co.is_del=0')
@@ -550,7 +550,7 @@ class Report extends Base
             ->select()
             ->toArray();
 
-        return app_show(0, '请求成功', ['list' => $data, 'total' => $total]);
+        return app_show(0, '请求成功', ['list' => $data, 'count' => $count]);
 
 
     }
@@ -1194,7 +1194,9 @@ class Report extends Base
     }
 
     //【七、商品报表】3.商品修改报表_列表
-    public function ChangeLogList(){}
+    public function ChangeLogList()
+    {
+    }
 
     //【七、商品报表】3.商品修改报表_导出
     public function ChangeLogExport()
@@ -1227,7 +1229,7 @@ class Report extends Base
             ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
             ->select()
             ->toArray();
-halt($list);
+        halt($list);
         if (empty($list)) $list[] = '没有可供导出的数据';
 
         $headerArr = array_keys($list[0]);