diff --git a/src/flash/flash.module.ts b/src/flash/flash.module.ts index 77523bb..8e2026a 100644 --- a/src/flash/flash.module.ts +++ b/src/flash/flash.module.ts @@ -1107,18 +1107,14 @@ where 1 = 0`, MAX(v.nome) AS nome, MAX(v.tipo_nodo) AS tipo_nodo, MAX(v.nivel) AS nivel, - CASE WHEN p.cod_empresa IS NULL - THEN NULL - ELSE MAX(v.cod_empresa) - END AS cod_empresa, 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.data_venda 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.data_venda 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 @@ -1128,7 +1124,7 @@ where 1 = 0`, SELECT nome AS nomeempresaapp, tipo_nodo AS canalapp, - cod_empresa AS cod_empresa, + codigo AS cod_empresa, is_total, m_mes AS meta_mes,