胡庆余堂

app/Service/ExportFileService.php

@@ -175,25 +175,14 @@ class ExportFileService extends Service
         $column = array_column($header_default,'key');
         $header = array_column($header_default,'value');
 
-        $ergs['order_type'] = RevenueCost::ORDER_TWO;
         $service = new StatisticsService();
-        list($status, $model) = $service->statisticsRevenueCostOneAndTwoCommon($ergs, $user);
-        if(! $status) return [false, $model];
-
-        $model->chunk(500,function ($data) use(&$return, $column, $service){
-            $data = $data->toArray();
-            $list['data'] = $data;
-
-            //订单数据
-            $list = $service->statisticsRevenueCostOneAndTwoFillData($list);
+        list($status, $result) = $service->statisticsEmployeeCommon($ergs, $user);
+        if(! $status) return [false, $result];
 
-            $this->fillData($list['data'], $column, $return);
-        });
-
-        //合计
-        $total = $this->countTotal($return, $header_default);
-        //填充合计
-        $this->fillTotalData($total, $header_default, $return);
+        list($model, $search) = $result;
+        $list = $model->get()->toArray();
+        $list = $service->statisticsEmployeeFillData($list, $search);
+        $this->fillData($list, $column, $return);
 
         return [true, $this->saveExportData($return,$header)];
     }
@@ -206,23 +195,13 @@ class ExportFileService extends Service
         $header = array_column($header_default,'value');
 
         $service = new StatisticsService();
-        list($status, $model) = $service->statisticsRevenueCostThreeCommon($ergs, $user);
-        if(! $status) return [false, $model];
-
-        $model->chunk(500,function ($data) use(&$return, $column, $service){
-            $data = $data->toArray();
-            $list['data'] = $data;
-
-            //订单数据
-            $list = $service->statisticsRevenueCostThreeFillData($list);
+        list($status, $result) = $service->statisticsDeviceCommon($ergs, $user);
+        if(! $status) return [false, $result];
 
-            $this->fillData($list['data'], $column, $return);
-        });
-
-        //合计
-        $total = $this->countTotal($return, $header_default);
-        //填充合计
-        $this->fillTotalData($total, $header_default, $return);
+        list($model, $search) = $result;
+        $list = $model->get()->toArray();
+        $list = $service->statisticsDeviceFillData($list, $search);
+        $this->fillData($list, $column, $return);
 
         return [true , $this->saveExportData($return,$header)];
     }

app/Service/StatisticsService.php

@@ -42,6 +42,10 @@ class StatisticsService extends Service
             $model->whereIn('b.item_id', $item_id);
         }
 
+        if(! empty($data['id'])){
+            $model->whereIn('a.data_id', $data['id']);
+        }
+
         if(! empty($data['employee_title'])) {
             $data_id = Employee::where('emp_name', 'LIKE', '%'.$data['employee_title'].'%')
                 ->where('del_time',0)
@@ -171,6 +175,10 @@ class StatisticsService extends Service
             $model->whereIn('b.item_id', $item_id);
         }
 
+        if(! empty($data['id'])){
+            $model->whereIn('a.data_id', $data['id']);
+        }
+
         if(! empty($data['device_title'])) {
             $data_id = Device::where('title', 'LIKE', '%'.$data['device_title'].'%')
                 ->where('del_time',0)