|
@@ -95,7 +95,7 @@ class ExportFileService extends Service
|
|
|
->whereIn('id', $id)
|
|
->whereIn('id', $id)
|
|
|
->select(Product::$field)
|
|
->select(Product::$field)
|
|
|
->orderBy('id','desc')
|
|
->orderBy('id','desc')
|
|
|
- ->chunkById(500,function ($data) use(&$return,$column){
|
|
|
|
|
|
|
+ ->chunk(500,function ($data) use(&$return,$column){
|
|
|
$data = Collect($data)->map(function ($object) {
|
|
$data = Collect($data)->map(function ($object) {
|
|
|
return (array)$object;
|
|
return (array)$object;
|
|
|
})->toArray();
|
|
})->toArray();
|
|
@@ -130,7 +130,7 @@ class ExportFileService extends Service
|
|
|
->whereIn('id', $id)
|
|
->whereIn('id', $id)
|
|
|
->select(Freight::$field)
|
|
->select(Freight::$field)
|
|
|
->orderBy('id','desc')
|
|
->orderBy('id','desc')
|
|
|
- ->chunkById(500,function ($data) use(&$return,$column){
|
|
|
|
|
|
|
+ ->chunk(500,function ($data) use(&$return,$column){
|
|
|
$data = Collect($data)->map(function ($object) {
|
|
$data = Collect($data)->map(function ($object) {
|
|
|
return (array)$object;
|
|
return (array)$object;
|
|
|
})->toArray();
|
|
})->toArray();
|
|
@@ -165,7 +165,7 @@ class ExportFileService extends Service
|
|
|
->whereIn('id', $id)
|
|
->whereIn('id', $id)
|
|
|
->select(RevenueCostTotal::$field)
|
|
->select(RevenueCostTotal::$field)
|
|
|
->orderBy('id','desc')
|
|
->orderBy('id','desc')
|
|
|
- ->chunkById(500,function ($data) use(&$return, $service, $column){
|
|
|
|
|
|
|
+ ->chunk(500,function ($data) use(&$return, $service, $column){
|
|
|
$data = Collect($data)->map(function ($object) {
|
|
$data = Collect($data)->map(function ($object) {
|
|
|
return (array)$object;
|
|
return (array)$object;
|
|
|
})->toArray();
|
|
})->toArray();
|
|
@@ -210,7 +210,7 @@ class ExportFileService extends Service
|
|
|
->whereIn('id', $id)
|
|
->whereIn('id', $id)
|
|
|
->select(RevenueCost::$field_xhd)
|
|
->select(RevenueCost::$field_xhd)
|
|
|
->orderBy('id','desc')
|
|
->orderBy('id','desc')
|
|
|
- ->chunkById(500,function ($data) use(&$return, $column, $service){
|
|
|
|
|
|
|
+ ->chunk(500,function ($data) use(&$return, $column, $service){
|
|
|
$data = Collect($data)->map(function ($object) {
|
|
$data = Collect($data)->map(function ($object) {
|
|
|
return (array)$object;
|
|
return (array)$object;
|
|
|
})->toArray();
|
|
})->toArray();
|
|
@@ -256,7 +256,7 @@ class ExportFileService extends Service
|
|
|
->whereIn('id', $id)
|
|
->whereIn('id', $id)
|
|
|
->select(RevenueCost::$field_xsfp)
|
|
->select(RevenueCost::$field_xsfp)
|
|
|
->orderBy('id','desc')
|
|
->orderBy('id','desc')
|
|
|
- ->chunkById(500,function ($data) use(&$return, $column, $service){
|
|
|
|
|
|
|
+ ->chunk(500,function ($data) use(&$return, $column, $service){
|
|
|
$data = Collect($data)->map(function ($object) {
|
|
$data = Collect($data)->map(function ($object) {
|
|
|
return (array)$object;
|
|
return (array)$object;
|
|
|
})->toArray();
|
|
})->toArray();
|
|
@@ -309,7 +309,7 @@ class ExportFileService extends Service
|
|
|
->select($field)
|
|
->select($field)
|
|
|
->groupby('order_id')
|
|
->groupby('order_id')
|
|
|
->orderBy('id','desc')
|
|
->orderBy('id','desc')
|
|
|
- ->chunkById(500,function ($data) use(&$return, $column, $service){
|
|
|
|
|
|
|
+ ->chunk(500,function ($data) use(&$return, $column, $service){
|
|
|
$data = Collect($data)->map(function ($object) {
|
|
$data = Collect($data)->map(function ($object) {
|
|
|
return (array)$object;
|
|
return (array)$object;
|
|
|
})->toArray();
|
|
})->toArray();
|
|
@@ -319,7 +319,7 @@ class ExportFileService extends Service
|
|
|
$list = $service->statisticsRevenueCostThreeFillData($list);
|
|
$list = $service->statisticsRevenueCostThreeFillData($list);
|
|
|
|
|
|
|
|
$this->fillData($list['data'], $column, $return);
|
|
$this->fillData($list['data'], $column, $return);
|
|
|
- },'order_id');
|
|
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
//合计
|
|
//合计
|
|
|
$total = $this->countTotal($return, $header_default);
|
|
$total = $this->countTotal($return, $header_default);
|
|
@@ -354,7 +354,7 @@ class ExportFileService extends Service
|
|
|
->whereIn('id', $id)
|
|
->whereIn('id', $id)
|
|
|
->select(GiveOut::$field)
|
|
->select(GiveOut::$field)
|
|
|
->orderBy('id','desc')
|
|
->orderBy('id','desc')
|
|
|
- ->chunkById(500,function ($data) use(&$return, $column, $service){
|
|
|
|
|
|
|
+ ->chunk(500,function ($data) use(&$return, $column, $service){
|
|
|
$data = Collect($data)->map(function ($object) {
|
|
$data = Collect($data)->map(function ($object) {
|
|
|
return (array)$object;
|
|
return (array)$object;
|
|
|
})->toArray();
|
|
})->toArray();
|
|
@@ -411,7 +411,7 @@ class ExportFileService extends Service
|
|
|
->select($field)
|
|
->select($field)
|
|
|
->groupBy('employee_index.employee_id', 'employee_index.start_time', 'employee_index.end_time')
|
|
->groupBy('employee_index.employee_id', 'employee_index.start_time', 'employee_index.end_time')
|
|
|
->orderBy('employee_index.end_time','desc')
|
|
->orderBy('employee_index.end_time','desc')
|
|
|
- ->chunkById(500, function ($data) use (&$return, $column, $service) {
|
|
|
|
|
|
|
+ ->chunk(500, function ($data) use (&$return, $column, $service) {
|
|
|
$data = Collect($data)->map(function ($object) {
|
|
$data = Collect($data)->map(function ($object) {
|
|
|
return (array)$object;
|
|
return (array)$object;
|
|
|
})->toArray();
|
|
})->toArray();
|
|
@@ -457,7 +457,7 @@ class ExportFileService extends Service
|
|
|
->whereIn('id', $id)
|
|
->whereIn('id', $id)
|
|
|
->select($field)
|
|
->select($field)
|
|
|
->orderBy('order_time','desc')
|
|
->orderBy('order_time','desc')
|
|
|
- ->chunkById(500, function ($data) use (&$return, $column, $service) {
|
|
|
|
|
|
|
+ ->chunk(500, function ($data) use (&$return, $column, $service) {
|
|
|
$data = Collect($data)->map(function ($object) {
|
|
$data = Collect($data)->map(function ($object) {
|
|
|
return (array)$object;
|
|
return (array)$object;
|
|
|
})->toArray();
|
|
})->toArray();
|
|
@@ -510,7 +510,7 @@ class ExportFileService extends Service
|
|
|
->select($field)
|
|
->select($field)
|
|
|
->groupby('order_time')
|
|
->groupby('order_time')
|
|
|
->orderby('order_time', 'desc')
|
|
->orderby('order_time', 'desc')
|
|
|
- ->chunkById(500, function ($data) use (&$return, $column, $service,$user, $dataSearch) {
|
|
|
|
|
|
|
+ ->chunk(500, function ($data) use (&$return, $column, $service,$user, $dataSearch) {
|
|
|
$data = $data->toArray();
|
|
$data = $data->toArray();
|
|
|
$list['data'] = $data;
|
|
$list['data'] = $data;
|
|
|
|
|
|
cqp