From c7e29947a0523ac5842156cc0cbc160eb92eba5f Mon Sep 17 00:00:00 2001 From: Gleimar Botelho Baleeiro Date: Thu, 2 May 2024 17:29:26 -0300 Subject: [PATCH] =?UTF-8?q?Ordena=C3=A7=C3=A3o=20da=20query=20do=20relat?= =?UTF-8?q?=C3=B3rio=20por=20linha=20e=20ordena=C3=A7=C3=A3o=20do=20java?= =?UTF-8?q?=20para=20o=20relat=C3=B3rio=20por=20trecho?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RelatorioAproveitamentoFinanceiro.java | 2 +- .../RelatorioAproveitamentoFinanceiroTrecho.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java index 447ff1133..a127c9f60 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java @@ -120,7 +120,7 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio { sql.append(" max(qtde) qtde, "); sql.append(" max(passageiros) tot "); sql.append(" for dia in ('1', '2', '3', '4', '5', '6', '7') "); - sql.append(") "); + sql.append(") ORDER BY numlinha,sentido,horario "); sql.append(") TB"); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java index ab13260ca..ce961c586 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java @@ -238,12 +238,14 @@ public class RelatorioAproveitamentoFinanceiroTrecho extends Relatorio { Collections.sort(dados, new Comparator> () { public int compare(Map m1, Map m2) { - return ((String) m1.get("NUMLINHA")).compareTo((String) m2.get("NUMLINHA")); - } - }); - Collections.sort(dados, new Comparator> () { - public int compare(Map m1, Map m2) { - return ((String) m1.get("SERVICO")).compareTo((String) m2.get("SERVICO")); + int compareNumLinha = ((String) m1.get("NUMLINHA")).compareTo((String) m2.get("NUMLINHA")); + + if (compareNumLinha != 0){ + return compareNumLinha; + }else{ + return ((String) m1.get("SERVICO")).compareTo((String) m2.get("SERVICO")); + } + } });