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

Refactor groupBy and orderBy clauses in getGrossAnnualEconomy method for improved query logic

Browse Source
This commit is contained in:
Giuliano Paschoalino 2026-01-21 15:23:25 -03:00
parent 775465e444
commit 17133c4326
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,9 +123,9 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
"CAST(TO_CHAR(TO_DATE(economia.mes, 'YYMM'), 'YYYY') AS INTEGER) <= COALESCE((" . $lastConsolidatedYearQuery->toSql() . "), CAST(TO_CHAR(CURRENT_DATE - INTERVAL '1 year', 'YYYY') AS INTEGER)) + 6", "CAST(TO_CHAR(TO_DATE(economia.mes, 'YYMM'), 'YYYY') AS INTEGER) <= COALESCE((" . $lastConsolidatedYearQuery->toSql() . "), CAST(TO_CHAR(CURRENT_DATE - INTERVAL '1 year', 'YYYY') AS INTEGER)) + 6",
$lastConsolidatedYearQuery->getBindings() $lastConsolidatedYearQuery->getBindings()
) )
->groupBy(['mes', 'ano', 'dad_estimado']) ->groupBy(['mes', 'ano', DB::raw("CASE WHEN extract(month from TO_DATE(economia.mes, 'YYMM')) = 12 THEN economia.dad_estimado ELSE true END")])
->havingRaw("sum(custo_livre) > 0") ->havingRaw("sum(custo_livre) > 0")
->orderBy(DB::raw("mes, ano, dad_estimado")) ->orderBy(DB::raw("ano, dad_estimado"))
->get(); ->get();
} }