hydrz/vd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

groupBy

Browse Source
This commit is contained in:
邓皓元 2019-02-15 13:47:58 +08:00
parent 0b6021e05e
commit 0694719c90
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Domains/Stats/Exports/CompanyReportDetailExport.php
View File

@ -43,7 +43,6 @@ class CompanyReportDetailExport extends AbstractExport implements FromQuery, Wit
'sim', 'sim',
'company_id', 'company_id',
'package_id', 'package_id',
'order_id',
'type', 'type',
DB::raw('CASE "type" WHEN 3 THEN SUM(counts) ELSE count(*) END AS counts'), DB::raw('CASE "type" WHEN 3 THEN SUM(counts) ELSE count(*) END AS counts'),
'unit_price' 'unit_price'
@ -51,7 +50,7 @@ class CompanyReportDetailExport extends AbstractExport implements FromQuery, Wit
$builder = $repository->forceNoReset()->select($select) $builder = $repository->forceNoReset()->select($select)
->withConditions($this->conditions) ->withConditions($this->conditions)
->groupBy('sim') ->groupBy('company_id', 'package_id', 'type', 'unit_price', 'sim')
->orderBy('id', 'desc'); ->orderBy('id', 'desc');
return $builder; return $builder;

3
app/Domains/Stats/Services/CompanyReportService.php
View File

@ -79,7 +79,6 @@ class CompanyReportService extends Service
'sim', 'sim',
'company_id', 'company_id',
'package_id', 'package_id',
'order_id',
'type', 'type',
DB::raw('CASE "type" WHEN 3 THEN SUM(counts) ELSE count(*) END AS counts'), DB::raw('CASE "type" WHEN 3 THEN SUM(counts) ELSE count(*) END AS counts'),
'unit_price' 'unit_price'
@ -87,7 +86,7 @@ class CompanyReportService extends Service
$query = $this->orderCardPartitionRepository->select($select) $query = $this->orderCardPartitionRepository->select($select)
->withConditions($conditions) ->withConditions($conditions)
->groupBy('sim') ->groupBy('company_id', 'package_id', 'type', 'unit_price', 'sim')
->orderBy('id', 'desc'); ->orderBy('id', 'desc');
$res = $query->paginate($conditions['limit']); $res = $query->paginate($conditions['limit']);