fix time
This commit is contained in:
@@ -28,21 +28,8 @@ class ReportService
|
|||||||
|
|
||||||
public function countryActivity(Request $request): array
|
public function countryActivity(Request $request): array
|
||||||
{
|
{
|
||||||
$from = null;
|
$from = $request->from_date ?? today()->startOfDay();
|
||||||
$to = null;
|
$to = $request->to_date ?? today()->endOfDay();
|
||||||
|
|
||||||
$filters = json_decode($request->filters ?? '[]', true);
|
|
||||||
|
|
||||||
foreach ($filters as $filter) {
|
|
||||||
if (($filter['fn'] ?? null) === 'between' && ($filter['id'] ?? null) === 'created_at') {
|
|
||||||
$from = ($filter['value'][0] ?? null) ? ($filter['value'][0] . ' 00:00:00') : null;
|
|
||||||
$to = ($filter['value'][1] ?? null) ? ($filter['value'][1] . ' 23:59:59') : null;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$from ??= '1970-01-01 00:00:00';
|
|
||||||
$to ??= now()->endOfDay()->toDateTimeString();
|
|
||||||
|
|
||||||
$sql = "
|
$sql = "
|
||||||
WITH r AS (
|
WITH r AS (
|
||||||
@@ -96,7 +83,7 @@ class ReportService
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function provinceActivity(Request $request, int $info_id): array
|
public function provinceActivity(Request $request, int $info_id)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user