From b1c30f49596e7517c6a48c029a3427846bab1ef9 Mon Sep 17 00:00:00 2001 From: denghy Date: Fri, 15 Feb 2019 13:48:49 +0800 Subject: [PATCH] groupBy --- app/Domains/Stats/Exports/CompanyReportDetailExport.php | 3 +-- app/Domains/Stats/Services/CompanyReportService.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Domains/Stats/Exports/CompanyReportDetailExport.php b/app/Domains/Stats/Exports/CompanyReportDetailExport.php index d78e499b..43008d25 100644 --- a/app/Domains/Stats/Exports/CompanyReportDetailExport.php +++ b/app/Domains/Stats/Exports/CompanyReportDetailExport.php @@ -50,8 +50,7 @@ class CompanyReportDetailExport extends AbstractExport implements FromQuery, Wit $builder = $repository->forceNoReset()->select($select) ->withConditions($this->conditions) - ->groupBy('company_id', 'package_id', 'type', 'unit_price', 'sim') - ->orderBy('id', 'desc'); + ->groupBy('company_id', 'package_id', 'type', 'unit_price', 'sim'); return $builder; } diff --git a/app/Domains/Stats/Services/CompanyReportService.php b/app/Domains/Stats/Services/CompanyReportService.php index 2d62c6ed..12b7c06c 100644 --- a/app/Domains/Stats/Services/CompanyReportService.php +++ b/app/Domains/Stats/Services/CompanyReportService.php @@ -86,8 +86,7 @@ class CompanyReportService extends Service $query = $this->orderCardPartitionRepository->select($select) ->withConditions($conditions) - ->groupBy('company_id', 'package_id', 'type', 'unit_price', 'sim') - ->orderBy('id', 'desc'); + ->groupBy('company_id', 'package_id', 'type', 'unit_price', 'sim'); $res = $query->paginate($conditions['limit']);