From 084c110ada6e82e59c8d863d90bf270e611108b4 Mon Sep 17 00:00:00 2001 From: Giuliano Paschoalino Date: Fri, 16 Jan 2026 17:19:05 -0300 Subject: [PATCH] Update date intervals in economy queries to extend the data range by one additional year --- app/Repositories/Economy/EconomyRepository.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Repositories/Economy/EconomyRepository.php b/app/Repositories/Economy/EconomyRepository.php index cb1f067..61a6c0d 100644 --- a/app/Repositories/Economy/EconomyRepository.php +++ b/app/Repositories/Economy/EconomyRepository.php @@ -48,7 +48,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt ->where( DB::raw("TO_DATE(economia.mes, 'YYMM')"), ">=", - DB::raw("TO_DATE(TO_CHAR(current_date , 'YYYY-12-01'), 'YYYY-MM-DD') - interval '1' year")) + DB::raw("TO_DATE(TO_CHAR(current_date , 'YYYY-12-01'), 'YYYY-MM-DD') - interval '2' year")) ->where(function ($query) { $query->where(DB::raw("extract(month from TO_DATE(economia.mes, 'YYMM'))"), '=', 12) ->orWhere(function ($query) { @@ -90,7 +90,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt ->where('dados_cadastrais.codigo_scde', '!=', '0P') ->where(DB::raw("TO_DATE(economia.mes, 'YYMM')"), ">=", - DB::raw("TO_DATE(TO_CHAR(current_date, 'YYYY-01-01'), 'YYYY-MM-DD')")) + DB::raw("TO_DATE(TO_CHAR(current_date, 'YYYY-01-01'), 'YYYY-MM-DD') - interval '2' year")) ->where(DB::raw("TO_DATE(economia.mes, 'YYMM')"), "<=", DB::raw("TO_DATE(TO_CHAR(current_date, 'YYYY-12-31'), 'YYYY-MM-DD')")) @@ -121,10 +121,10 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt ->whereBetween( 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 '2' year"), DB::raw("TO_DATE(TO_CHAR(current_date, 'YYYY-12-31'), 'YYYY-MM-DD') ") ]) - ->whereRaw("TO_DATE(economia.mes, 'YYMM') >= TO_DATE(TO_CHAR(current_date , 'YYYY-01-01'), 'YYYY-MM-DD') - INTERVAL '0' year") + // ->whereRaw("TO_DATE(economia.mes, 'YYMM') >= TO_DATE(TO_CHAR(current_date , 'YYYY-01-01'), 'YYYY-MM-DD') - INTERVAL '0' year") ->groupBy(['mes', 'dad_estimado']) ->havingRaw("sum(custo_livre) > 0") ->orderBy(DB::raw("mes, dad_estimado")) @@ -146,7 +146,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt ->whereBetween( 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 '2' year"), DB::raw("TO_DATE(TO_CHAR(current_date, 'YYYY-12-31'), 'YYYY-MM-DD') ") ]) ->groupBy(['mes', 'dad_estimado'])