From 86137056247da8077044629780f0002a20c4de93 Mon Sep 17 00:00:00 2001 From: Luiz Filipe Date: Tue, 23 Aug 2022 12:14:06 -0300 Subject: [PATCH] demanda fix --- app/Repositories/Med5min/Med5minRepository.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Repositories/Med5min/Med5minRepository.php b/app/Repositories/Med5min/Med5minRepository.php index e4e5d0f..f4ef795 100644 --- a/app/Repositories/Med5min/Med5minRepository.php +++ b/app/Repositories/Med5min/Med5minRepository.php @@ -241,9 +241,9 @@ class Med5minRepository extends AbstractRepository implements Med5minContractInt $field = [ - DB::raw("(CASE WHEN ((med_5min.minuto/60) >= 18 AND (med_5min.minuto/60) <= 21) THEN dados_cadastrais.demanda_p ELSE dados_cadastrais.demanda_fp END)*1.05 as dem_tolerancia"), + DB::raw("(CASE WHEN ((med_5min.minuto-5/60) >= 18 AND (med_5min.minuto-5/60) < 21 AND extract( dow from date '1899-12-30' + cast (med_5min.dia_num as integer)) BETWEEN 1 AND 5) THEN dados_cadastrais.demanda_p ELSE dados_cadastrais.demanda_fp END)*1.05 as dem_tolerancia"), DB::raw("SUM(med_5min.ativa_consumo) AS dem_reg"), - DB::raw("(CASE WHEN ((med_5min.minuto/60) >= 18 AND (med_5min.minuto/60) <= 21) THEN dados_cadastrais.demanda_p ELSE dados_cadastrais.demanda_fp END) as dem_cont") + DB::raw("(CASE WHEN ((med_5min.minuto-5/60) >= 18 AND (med_5min.minuto-5/60) <= 21 AND extract( dow from date '1899-12-30' + cast (med_5min.dia_num as integer)) BETWEEN 1 AND 5) THEN dados_cadastrais.demanda_p ELSE dados_cadastrais.demanda_fp END) as dem_cont") ]; return $collection->merge($field);