From 0ce8bbf31c6bd7df0b376577faa6f8a813840f51 Mon Sep 17 00:00:00 2001 From: denghy Date: Tue, 16 Apr 2019 17:15:44 +0800 Subject: [PATCH] =?UTF-8?q?total=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Domains/Company/Http/Controllers/CardController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Domains/Company/Http/Controllers/CardController.php b/app/Domains/Company/Http/Controllers/CardController.php index d5e418d3..17ada81f 100644 --- a/app/Domains/Company/Http/Controllers/CardController.php +++ b/app/Domains/Company/Http/Controllers/CardController.php @@ -4,9 +4,10 @@ namespace App\Domains\Company\Http\Controllers; use App\Core\Controller; use Illuminate\Http\Request; use Illuminate\Support\Carbon; -use App\Domains\Virtual\Repositories\OrderCardPartitionRepository; +use Illuminate\Support\Facades\DB; use App\Domains\Virtual\Services\PackageService; use App\Domains\Virtual\Services\ProductService; +use App\Domains\Virtual\Repositories\OrderCardPartitionRepository; class CardController extends Controller { @@ -39,7 +40,7 @@ class CardController extends Controller $limit = $conditions['limit'] ?? 20; - $cards = $this->orderCardPartitionRepository->selectRaw('distinct on (sim) sim, company_id')->withConditions($conditions)->paginate($limit); + $cards = $this->orderCardPartitionRepository->select(['sim', DB::raw('MIN(company_id)')])->withConditions($conditions)->groupBy('sim')->paginate($limit); $services = $this->orderCardPartitionRepository->selectRaw('sim,MIN(service_start_at) as service_start_at,MAX(service_end_at) as service_end_at') ->whereIn('sim', $cards->pluck('sim')->toArray())->groupBy('sim')->get()->keyBy('sim');