From a3e3abc8a63e73831b3e52992ff2fad9da015156 Mon Sep 17 00:00:00 2001 From: leonardo Date: Thu, 19 Feb 2015 13:17:20 +0000 Subject: [PATCH] fixes bug #6046 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@41568 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioEmpresaOnibus.java | 45 +++++++++++++++--- .../templates/RelatorioEmpresaOnibus.jasper | Bin 33618 -> 36019 bytes .../templates/RelatorioEmpresaOnibus.jrxml | 31 +++++++++++- 3 files changed, 68 insertions(+), 8 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaOnibus.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaOnibus.java index fa6cd2e22..d85bc93c0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaOnibus.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaOnibus.java @@ -2,11 +2,13 @@ package com.rjconsultores.ventaboletos.relatorios.impl; import java.sql.Connection; import java.sql.ResultSet; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; +import java.util.Date; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -57,7 +59,9 @@ public class RelatorioEmpresaOnibus extends Relatorio { rset = stmt.executeQuery(); - Map mDadosRelatorio = new HashMap(); + // Soma os kms dos tramos. + // HashMap utilizado para identificar os tramos de uma corrida + Map mDadosRelatorio = new LinkedHashMap(); lsDadosRelatorio = new ArrayList(); sdf.applyPattern("dd/MM/yyyy"); @@ -87,18 +91,44 @@ public class RelatorioEmpresaOnibus extends Relatorio { } mDadosRelatorio.put(key, empresaOnibusBean); - } + } - for (Entry empresaOnibusBean : mDadosRelatorio.entrySet()) { + for (Entry empresaOnibusBean : mDadosRelatorio.entrySet()) { lsDadosRelatorio.add(empresaOnibusBean.getValue()); - } - + } if (lsDadosRelatorio.size() > 0) { Collections.sort(lsDadosRelatorio,new Comparator() { @Override public int compare(RelatorioEmpresaOnibusBean o1, RelatorioEmpresaOnibusBean o2) { - return o1.getEmpresa().compareToIgnoreCase(o2.getEmpresa()); + int result = o1.getEmpresa().compareToIgnoreCase(o2.getEmpresa()); + if (result != 0){ + return result; + } + + result = o1.getCoche().compareTo(o2.getCoche()); + if (result != 0){ + return result; + } + + result = o1.getDia().compareTo(o2.getDia()); + if (result != 0){ + return result; + } + + SimpleDateFormat formatter = new SimpleDateFormat("HH:mm"); + Date h1; + Date h2; + try { + h1 = formatter.parse(o1.getHora()); + h2 = formatter.parse(o2.getHora()); + } catch (ParseException e) { + return result; + } + + + result = h1.compareTo(h2); + return result; } }); setLsDadosRelatorio(lsDadosRelatorio); @@ -115,6 +145,7 @@ public class RelatorioEmpresaOnibus extends Relatorio { @Override protected void processaParametros() throws Exception { + } private String getSql(String empresa, String autobus) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jasper index 305389cfcb4902c251bc7ea638c805e6ece7e491..edfdeb84797eb5c45831dd2373c867e32cd67caf 100644 GIT binary patch delta 9840 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 delta 8125 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 PtKn8R$M;dU-_`AZAN13t diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jrxml index 020cfccb9..11a85453d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaOnibus.jrxml @@ -2,7 +2,7 @@ - + @@ -26,6 +26,12 @@ + + + + + + @@ -114,6 +120,29 @@ + + + + + + + + + + + + + + + + + + + + + + +