From 7ac06b6dd6a2f552807971e3bdd51f97d205c193 Mon Sep 17 00:00:00 2001 From: Giuliano Paschoalino Date: Mon, 19 Jan 2026 13:55:28 -0300 Subject: [PATCH] Fix date filtering in getGrossMonthlyEconomy and getCaptiveMonthlyEconomy methods for accurate data retrieval --- app/Repositories/Economy/EconomyRepository.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Repositories/Economy/EconomyRepository.php b/app/Repositories/Economy/EconomyRepository.php index 61a6c0d..32d0ecf 100644 --- a/app/Repositories/Economy/EconomyRepository.php +++ b/app/Repositories/Economy/EconomyRepository.php @@ -93,7 +93,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt 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')")) + DB::raw("TO_DATE(TO_CHAR(current_date, 'YYYY-MM-DD'), 'YYYY-MM-DD')")) ->groupBy(['mes', 'dad_estimado']) ->orderBy(DB::raw("mes, dad_estimado")) ->havingRaw("sum(custo_livre) > 0") @@ -122,7 +122,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt DB::raw("TO_DATE(economia.mes, 'YYMM')"), [ 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') ") + DB::raw("TO_DATE(TO_CHAR(current_date, 'YYYY-MM-DD'), 'YYYY-MM-DD') ") ]) // ->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'])