diff --git a/src/flash/flash.module.ts b/src/flash/flash.module.ts index 14f1065..7ca49bc 100644 --- a/src/flash/flash.module.ts +++ b/src/flash/flash.module.ts @@ -1005,6 +1005,7 @@ where 1 = 0`, CROSS JOIN Parametros p WHERE n.tipo_nodo = 'EMPRESA' AND n.ativo = 'S' + AND n.cod_empresa IN (${args.ctx_user_companies_for_module}) AND ( r.data_referencia BETWEEN p.dt_inicio_mes AND p.dt_ref 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) @@ -1017,6 +1018,7 @@ where 1 = 0`, FROM VERDEMAR.ORCADO_METAS_IMPORT m CROSS JOIN Parametros p WHERE m.data BETWEEN p.dt_inicio_mes AND LAST_DAY(p.dt_ref) + AND FNC_CODIGOLOJA(m.loja_ajustada) IN (${args.ctx_user_companies_for_module}) ), DadosUnificados AS ( SELECT * FROM Vendas @@ -1029,23 +1031,30 @@ where 1 = 0`, SUM(CASE WHEN d.data BETWEEN p.dt_inicio_mes AND p.dt_ref THEN d.venda ELSE 0 END) AS v_mes, SUM(CASE WHEN d.data BETWEEN p.dt_inicio_mes AND LAST_DAY(p.dt_ref) THEN d.meta ELSE 0 END) AS m_mes, SUM(CASE WHEN d.data BETWEEN p.dt_inicio_mes_ant AND p.dt_fim_mes_ant THEN d.venda ELSE 0 END) AS v_mes_ant, - SUM(CASE WHEN d.data BETWEEN p.dt_inicio_ano_ant AND p.dt_fim_ano_ant THEN d.venda ELSE 0 END) AS v_ano_ant + SUM(CASE WHEN d.data BETWEEN p.dt_inicio_mes_ant AND p.dt_fim_mes_ant THEN d.meta ELSE 0 END) AS m_mes_ant, + SUM(CASE WHEN d.data BETWEEN p.dt_inicio_ano_ant AND p.dt_fim_ano_ant THEN d.venda ELSE 0 END) AS v_ano_ant, + SUM(CASE WHEN d.data BETWEEN p.dt_inicio_ano_ant AND p.dt_fim_ano_ant THEN d.meta ELSE 0 END) AS m_ano_ant FROM DadosUnificados d CROSS JOIN Parametros p GROUP BY d.loja ) SELECT 'Lojas' AS canalapp, - (loja) AS cod_empresa, + (loja) AS cod_empresa, FNC_NOMEPESSOAS(loja) AS nomeempresaapp, GROUPING(loja) AS is_total, + SUM(m_mes) AS meta_mes, SUM(v_mes) AS mes_atual, SUM(v_mes) - SUM(m_mes) AS dif_mes_atual, ROUND(NVL((SUM(v_mes) / NULLIF(SUM(m_mes), 0)) * 100 - 100, 0), 2) AS variacao_atual, + + SUM(m_mes_ant) AS meta_mes_anterior, SUM(v_mes_ant) AS mes_anterior, SUM(v_mes) - SUM(v_mes_ant) AS dif_mes_anterior, ROUND(NVL((SUM(v_mes) / NULLIF(SUM(v_mes_ant), 0)) * 100 - 100, 0), 2) AS variacao_mes_anterior, + + SUM(m_ano_ant) AS meta_ano_anterior, SUM(v_ano_ant) AS ano_anterior, SUM(v_mes) - SUM(v_ano_ant) AS dif_ano_anterior, ROUND(NVL((SUM(v_mes) / NULLIF(SUM(v_ano_ant), 0)) * 100 - 100, 0), 2) AS variacao_ano_anterior