|
|
|
@ -370,8 +370,13 @@ class StatisticsController extends CommonController
|
|
|
|
})
|
|
|
|
})
|
|
|
|
->whereNull("orders.deleted_at")
|
|
|
|
->whereNull("orders.deleted_at")
|
|
|
|
->where("orders.project_id", $project_id)
|
|
|
|
->where("orders.project_id", $project_id)
|
|
|
|
->whereDate("orders.from_date", "<=", $before_date)
|
|
|
|
->whereExists(function ($query) use ($before_date) {
|
|
|
|
->whereDate("orders.to_date", ">=", $before_date)
|
|
|
|
$query->select(DB::raw(1))
|
|
|
|
|
|
|
|
->from('order_items')
|
|
|
|
|
|
|
|
->whereColumn('order_items.order_id', 'orders.id')
|
|
|
|
|
|
|
|
->whereNull('order_items.deleted_at')
|
|
|
|
|
|
|
|
->whereDate('order_items.service_date', $before_date);
|
|
|
|
|
|
|
|
})
|
|
|
|
->groupBy(
|
|
|
|
->groupBy(
|
|
|
|
"orders.id",
|
|
|
|
"orders.id",
|
|
|
|
"orders.serial",
|
|
|
|
"orders.serial",
|
|
|
|
|
weizong song
2 months ago