Smart/smartEnergyView-backend
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction in the api.

Browse Source
This commit is contained in:
Djonathan 2022-07-06 13:54:25 -03:00
parent c79f82f8eb
commit 3f43c5d739
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Repositories/Economy/EconomyRepository.php
View File

@ -43,15 +43,14 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
"economia.dad_estimado" "economia.dad_estimado"
]; ];
DB::enableQueryLog();
$this->execute($params, $field) return $this->execute($params, $field)
->where(DB::raw("TO_DATE(economia.mes, 'YYMM')"), ->where(DB::raw("TO_DATE(economia.mes, 'YYMM')"),
">=", ">=",
DB::raw("TO_DATE(TO_CHAR(current_date , 'YYYY-01-01'), 'YYYY-MM-DD') - interval '1' year")) DB::raw("TO_DATE(TO_CHAR(current_date , 'YYYY-01-01'), 'YYYY-MM-DD') - interval '1' year"))
->groupBy(['ano', 'dad_estimado']) ->groupBy(['ano', 'dad_estimado'])
->orderBy(DB::raw("ano, dad_estimado")) ->orderBy(DB::raw("ano, dad_estimado"))
->get(); ->get();
dd(DB::getQueryLog());
} }
/* Economia bruta mensal */ /* Economia bruta mensal */
@ -72,7 +71,10 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
->orderBy(DB::raw("mes, dad_estimado")) ->orderBy(DB::raw("mes, dad_estimado"))
->get(); ->get();
return collect(static::checkDate($result))->transform(fn($value) => Arr::set($value, 'mes', date_format(date_create($value['mes']), "M/Y")))->all(); return collect(static::checkDate($result))
->transform(fn($value)
=> Arr::set($value, 'mes', date_format(date_create($value['mes']), "M/Y")))
->all();
} }
@ -120,7 +122,10 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
->orderBy(DB::raw("mes, dad_estimado")) ->orderBy(DB::raw("mes, dad_estimado"))
->get(); ->get();
return collect(static::checkDate($result))->transform(fn($value) => Arr::set($value, 'mes', date_format(date_create($value['mes']), "M/Y")))->all(); return collect(static::checkDate($result))
->transform(fn($value)
=> Arr::set($value, 'mes', date_format(date_create($value['mes']), "M/Y")))
->all();
} }