From 4af4233d60ae7872f5846e89c6ca34dee259e900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sarah=20Magalh=C3=A3es?= Date: Wed, 3 Jun 2026 10:28:31 -0300 Subject: [PATCH] Ajuste query flash categoria --- src/flash/flash.module.ts | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/flash/flash.module.ts b/src/flash/flash.module.ts index be0d27b..77523bb 100644 --- a/src/flash/flash.module.ts +++ b/src/flash/flash.module.ts @@ -1059,19 +1059,19 @@ where 1 = 0`, sql: /*sql*/` WITH Parametros_Base AS ( SELECT - TO_DATE(${args.data_venda}, 'YYYY-MM-DD') AS dt_ref, + TO_DATE(${args.data_venda}, 'YYYY-MM-DD') AS data_venda, ${args.codigo_categoria_pai} AS codigo_categoria_pai, ${args.cod_empresa} AS cod_empresa FROM DUAL ), Parametros AS ( SELECT - dt_ref, - TRUNC(dt_ref, 'MM') AS dt_inicio_mes, - ADD_MONTHS(TRUNC(dt_ref, 'MM'), -1) AS dt_inicio_mes_ant, - ADD_MONTHS(dt_ref, -1) AS dt_fim_mes_ant, - ADD_MONTHS(TRUNC(dt_ref, 'MM'), -12) AS dt_inicio_ano_ant, - ADD_MONTHS(dt_ref, -12) AS dt_fim_ano_ant, + data_venda, + TRUNC(data_venda, 'MM') AS dt_inicio_mes, + ADD_MONTHS(TRUNC(data_venda, 'MM'), -1) AS dt_inicio_mes_ant, + ADD_MONTHS(data_venda, -1) AS dt_fim_mes_ant, + ADD_MONTHS(TRUNC(data_venda, 'MM'), -12) AS dt_inicio_ano_ant, + ADD_MONTHS(data_venda, -12) AS dt_fim_ano_ant, codigo_categoria_pai, cod_empresa FROM Parametros_Base @@ -1097,14 +1097,12 @@ where 1 = 0`, FROM filhos f JOIN VERDEMAR.TB_FLASH_NODO_RESUMO_VENDA r ON r.id_nodo = f.id_nodo CROSS JOIN Parametros p - WHERE ( r.data_referencia BETWEEN p.dt_inicio_mes AND p.dt_ref + WHERE ( r.data_referencia BETWEEN p.dt_inicio_mes AND p.data_venda OR r.data_referencia BETWEEN p.dt_inicio_mes_ant AND p.dt_fim_mes_ant OR r.data_referencia BETWEEN p.dt_inicio_ano_ant AND p.dt_fim_ano_ant) ), Agrupado AS ( SELECT - -- Quando N�O tem filtro de empresa: agrupa por CODIGO (consolida v�rias empresas) - -- Quando TEM filtro de empresa: agrupa por ID_NODO (cada empresa separada) v.codigo AS codigo, MAX(v.nome) AS nome, MAX(v.tipo_nodo) AS tipo_nodo, @@ -1116,11 +1114,11 @@ where 1 = 0`, MAX(v.ordem_exibicao) AS ordem_exibicao, GROUPING(v.codigo) AS is_total, - SUM(CASE WHEN v.data BETWEEN p.dt_inicio_mes AND p.dt_ref THEN v.venda ELSE 0 END) AS v_mes, + SUM(CASE WHEN v.data BETWEEN p.dt_inicio_mes AND p.data_venda THEN v.venda ELSE 0 END) AS v_mes, SUM(CASE WHEN v.data BETWEEN p.dt_inicio_mes_ant AND p.dt_fim_mes_ant THEN v.venda ELSE 0 END) AS v_mes_ant, SUM(CASE WHEN v.data BETWEEN p.dt_inicio_ano_ant AND p.dt_fim_ano_ant THEN v.venda ELSE 0 END) AS v_ano_ant, - SUM(CASE WHEN v.data BETWEEN p.dt_inicio_mes AND p.dt_ref THEN v.meta ELSE 0 END) AS m_mes, + SUM(CASE WHEN v.data BETWEEN p.dt_inicio_mes AND p.data_venda THEN v.meta ELSE 0 END) AS m_mes, SUM(CASE WHEN v.data BETWEEN p.dt_inicio_mes_ant AND p.dt_fim_mes_ant THEN v.meta ELSE 0 END) AS m_mes_ant, SUM(CASE WHEN v.data BETWEEN p.dt_inicio_ano_ant AND p.dt_fim_ano_ant THEN v.meta ELSE 0 END) AS m_ano_ant FROM Vendas_Metas v