From 20e5af32b0a61e04cdfeacdea64cb3cdbcac2b8a Mon Sep 17 00:00:00 2001 From: denghy Date: Mon, 16 Dec 2019 17:16:48 +0800 Subject: [PATCH] havingRaw --- .../Repositories/Concerns/OrderCardConcern.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php b/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php index 6b496154..bac778a8 100644 --- a/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php +++ b/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php @@ -103,8 +103,7 @@ trait OrderCardConcern if (isset($conditions['service_start_starttime'])) { $date = Carbon::parse($conditions['service_start_starttime']); $havingRaw = sprintf("sim in (SELECT sim FROM virtual_order_cards_partition GROUP BY sim HAVING MIN(service_start_at) >= '%s')", $date); - $this->model = $this->model->whereNotNull('service_start_at') - ->whereRaw($havingRaw); + $this->model = $this->model->whereRaw($havingRaw); // $query->where('service_start_at', '>=', Carbon::parse($conditions['service_start_starttime'])); } @@ -112,8 +111,7 @@ trait OrderCardConcern if (isset($conditions['service_start_endtime'])) { $date = Carbon::parse($conditions['service_start_starttime']); $havingRaw = sprintf("sim in (SELECT sim FROM virtual_order_cards_partition GROUP BY sim HAVING MIN(service_start_at) <= '%s')", $date); - $this->model = $this->model->whereNotNull('service_start_at') - ->whereRaw($havingRaw); + $this->model = $this->model->whereRaw($havingRaw); // $query->where('service_start_at', '<=', Carbon::parse($conditions['service_start_endtime'])); } @@ -121,8 +119,7 @@ trait OrderCardConcern if (isset($conditions['service_end_starttime'])) { $date = Carbon::parse($conditions['service_end_starttime']); $havingRaw = sprintf("sim in (SELECT sim FROM virtual_order_cards_partition GROUP BY sim HAVING MAX(service_end_at) >= '%s')", $date); - $this->model = $this->model->whereNotNull('service_start_at') - ->whereRaw($havingRaw); + $this->model = $this->model->whereRaw($havingRaw); // $query->where('service_end_at', '>=', Carbon::parse($conditions['service_end_starttime'])); } @@ -130,8 +127,7 @@ trait OrderCardConcern if (isset($conditions['service_end_endtime'])) { $date = Carbon::parse($conditions['service_end_starttime']); $havingRaw = sprintf("sim in (SELECT sim FROM virtual_order_cards_partition GROUP BY sim HAVING MAX(service_end_at) <= '%s')", $date); - $this->model = $this->model->whereNotNull('service_start_at') - ->whereRaw($havingRaw); + $this->model = $this->model->whereRaw($havingRaw); // $query->where('service_end_at', '<=', Carbon::parse($conditions['service_end_endtime'])); }