Atualização de campos e Queries

src/flash/flash.module.ts

@@ -30,40 +30,49 @@ export default moduleFactory
               format: "currency_short",
             },
             {
-              label: "VDA",
-              column: "vda",
+              label: "Mês Atual",
+              column: "mes_atual",
               format: "currency_short",
             },
             {
-              label: "DMA",
-              column: "dma",
+              label: "Dif ($)",
+              column: "dif_mes_atual",
               format: "currency_short",
             },
             {
-              label: "Meta Dia",
-              column: "meta_dia",
-              format: "currency_short",
-            },
-            {
-              label: "Meta Margem Dia",
-              column: "meta_margem_dia",
+              label: "% Variação",
+              column: "variacao_atual",
               format: "percentage",
             },
             {
-              label: "Qtd Clientes",
-              column: "qtd_clientes",
-              format: "integer",
+              label: "Mês Anterior",
+              column: "mes_anterior",
+              format: "currency_short",
             },
             {
-              label: "Ticket Médio",
-              column: "ticket_medio",
-              format: "currency",
+              label: "Dif ($)",
+              column: "dif_mes_anterior",
+              format: "currency_short",
             },
             {
-              label: "Margem",
-              column: "margem",
+              label: "% Variação",
+              column: "variacao_mes_anterior",
+              format: "percentage",
+            },
+            {
+              label: "Ano Anterior",
+              column: "ano_anterior",
+              format: "currency_short",
+            },
+            {
+              label: "Dif ($)",
+              column: "dif_ano_anterior",
+              format: "currency_short",
+            },
+            {
+              label: "% Variação",
+              column: "variacao_ano_anterior",
               format: "percentage",
-              accent: true,
             },
           ],
         },
@@ -110,10 +119,12 @@ order by grouping(canalapp) desc, grouping(nomeempresaapp) desc`,
           sql: /*sql*/ `
             SELECT
               CASE 
-                WHEN GROUPING(x.canalapp) = 1 THEN 'TOTAL'
+                  WHEN GROUPING(x.canalapp) = 1 THEN null
                   ELSE x.canalapp
               END AS canalapp,
 
+              x.canalapp AS nomeempresaapp,
+
               CASE 
                   WHEN GROUPING(x.canalapp) = 1 THEN 1
                   ELSE 0
@@ -187,9 +198,13 @@ order by grouping(canalapp) desc, grouping(nomeempresaapp) desc`,
                 )
           ) x
 
-        GROUP BY ROLLUP(x.codigo, x.canalapp)
-
-        ORDER BY is_total, canalapp
+        GROUP BY GROUPING SETS (
+          (x.codigo, x.canalapp),
+          ()
+      )
+      ORDER BY 
+          CASE WHEN GROUPING(x.canalapp) = 1 THEN 1 ELSE 0 END,
+          x.canalapp
           `,};
         },
         },