This commit is contained in:
邓皓元 2019-02-15 13:48:49 +08:00
parent 0694719c90
commit b1c30f4959
2 changed files with 2 additions and 4 deletions

View File

@ -50,8 +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('company_id', 'package_id', 'type', 'unit_price', 'sim') ->groupBy('company_id', 'package_id', 'type', 'unit_price', 'sim');
->orderBy('id', 'desc');
return $builder; return $builder;
} }

View File

@ -86,8 +86,7 @@ class CompanyReportService extends Service
$query = $this->orderCardPartitionRepository->select($select) $query = $this->orderCardPartitionRepository->select($select)
->withConditions($conditions) ->withConditions($conditions)
->groupBy('company_id', 'package_id', 'type', 'unit_price', 'sim') ->groupBy('company_id', 'package_id', 'type', 'unit_price', 'sim');
->orderBy('id', 'desc');
$res = $query->paginate($conditions['limit']); $res = $query->paginate($conditions['limit']);