From 9e196d45070f5f258be146a233c86b87ac6fa310 Mon Sep 17 00:00:00 2001
From: emerson <emerson@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 3 Jul 2018 17:51:57 +0000
Subject: [PATCH] fixes bug#0011329 dev: emerson qua: renato.oliveira
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Os valores estão repetidos, pois tratam-se de serviços diferentes.

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@83078 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioEmpresaCorrida.java         | 202 ++++++++++--------
 .../RelatorioEmpresaCorridaNovoLayout.java    |  86 +-------
 .../templates/RelatorioEmpresaCorrida.jasper  | Bin 41950 -> 42044 bytes
 .../templates/RelatorioEmpresaCorrida.jrxml   |  50 +++--
 .../RelatorioEmpresaCorridaNovoLayout.jasper  | Bin 47810 -> 47960 bytes
 .../RelatorioEmpresaCorridaNovoLayout.jrxml   | 186 ++++++++--------
 .../RelatorioEmpresaCorridaBean.java          |  18 +-
 7 files changed, 260 insertions(+), 282 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java
index 09670b7ed..1918abfb0 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java
@@ -1,9 +1,9 @@
 package com.rjconsultores.ventaboletos.relatorios.impl;
 
+import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -61,7 +61,6 @@ public class RelatorioEmpresaCorrida extends Relatorio {
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
 				ResultSet rset = null;
 
-				SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss");
 				stmt.setString(FILED_FEC_INICIO, fecInicio);
 				stmt.setString(FIELD_FEC_FINAL, fecFinal);
 				if (empresa != null && !empresa.equals("")) {
@@ -74,58 +73,63 @@ public class RelatorioEmpresaCorrida extends Relatorio {
 				List<RelatorioEmpresaCorridaBean> lsDadosRelatorio = new ArrayList<RelatorioEmpresaCorridaBean>();
 
 				log.info("Preenchendo bean:" + System.currentTimeMillis());
-				while (rset.next()) {
-					RelatorioEmpresaCorridaBean bean = new RelatorioEmpresaCorridaBean();
-					setDadosBean(rset, bean);
-					lsDadosRelatorio.add(bean);
-				}
+				setDadosRelatorio(rset, lsDadosRelatorio);
 				log.info("Fim bean:" + System.currentTimeMillis());
 
-				log.info("empresa:" + empresa + ";fecinicio:" + fecInicio + ";fecFinal:" + fecFinal);
-				String sqlKm = getSqlKm(empresa);
-				log.info(sqlKm);
-
-				stmt = new NamedParameterStatement(conexao, sqlKm);
-				rset = null;
-
-				stmt.setTimestamp(FILED_FEC_INICIO, new java.sql.Timestamp(sdf.parse(fecInicio).getTime()));
-				stmt.setTimestamp(FIELD_FEC_FINAL, new java.sql.Timestamp(sdf.parse(fecFinal).getTime()));
-				if (empresa != null && !empresa.equals("")) {
-					stmt.setInt(FIELD_EMPRESA_ID, Integer.parseInt(empresa));
-				}
-
-				List<RelatorioEmpresaCorridaBean> lsAux = new ArrayList<RelatorioEmpresaCorridaBean>();
-
-				log.info("Antes  de enviar consulta para o banco:" + System.currentTimeMillis());
-				rset = stmt.executeQuery();
-				log.info("Depois de enviar consulta para o banco:" + System.currentTimeMillis());
-				while (rset.next()) {
-
-					RelatorioEmpresaCorridaBean rec = buscarRelatorioEmpresaCorrida(lsDadosRelatorio, rset);
-					if (rec != null) {
-						rec.setKmOnibusArrendados(rset.getInt(FIELD_KM_ONIBUS_ARRENDADOS));
-						rec.setKmOnibusProprio(rset.getInt(FIELD_KM_ONIBUS_PROPRIO));
-						rec.setKmTotal(rset.getInt(FIELD_KM_TOTAL));
-
-						lsAux.add(rec);
-					}
-				}
-
-				if (lsAux.size() > 0) {
-					setLsDadosRelatorio(lsAux);
+				if (lsDadosRelatorio.size() > 0) {
+					setLsDadosRelatorio(lsDadosRelatorio);
 				}
 			}
 
 		});
 	}
 	
+	protected void setDadosRelatorio(ResultSet rset, List<RelatorioEmpresaCorridaBean> lsDadosRelatorio) throws SQLException {
+		RelatorioEmpresaCorridaBean bean = new RelatorioEmpresaCorridaBean();
+		while (rset.next()) {
+			if (possuiRutaNoBean(rset.getInt(FIELD_RUTA_ID), lsDadosRelatorio)) {
+				setValoresAgrupados(rset, bean);
+				continue;
+			} else {
+				bean = new RelatorioEmpresaCorridaBean();
+				setDadosBean(rset, bean);
+			}
+			lsDadosRelatorio.add(bean);
+		}
+	}
+	
+	private boolean possuiRutaNoBean(int ruta_id, List<RelatorioEmpresaCorridaBean> lsDadosRelatorio) {
+		for (RelatorioEmpresaCorridaBean relatorioBean : lsDadosRelatorio) {
+			if (ruta_id == relatorioBean.getRutaId()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	protected void setDadosBean(ResultSet rset, RelatorioEmpresaCorridaBean bean) throws SQLException {
 		bean.setRutaId(rset.getInt(FIELD_RUTA_ID));
-		bean.setAbonos(rset.getBigDecimal(FIELD_ABONOS));
-		bean.setBoletos(rset.getBigDecimal(FIELD_BOLETOS));
 		bean.setEmpresa(rset.getString(FIELD_NOMB_EMPRESA));
 		bean.setLinea(rset.getString(FIELD_LINEA));
+		bean.setAbonos(rset.getBigDecimal(FIELD_ABONOS));
+		bean.setBoletos(rset.getBigDecimal(FIELD_BOLETOS));
 		bean.setPasajerosTransportados(rset.getInt(FIELD_PASSAGEIROS_TRANSP));
+		bean.setKmOnibusArrendados(rset.getBigDecimal(FIELD_KM_ONIBUS_ARRENDADOS));
+		bean.setKmOnibusProprio(rset.getBigDecimal(FIELD_KM_ONIBUS_PROPRIO));
+		bean.setKmTotal(rset.getBigDecimal(FIELD_KM_TOTAL));
+	}
+
+	private void setValoresAgrupados(ResultSet rset, RelatorioEmpresaCorridaBean bean) throws SQLException {
+		bean.setAbonos(rset.getBigDecimal(FIELD_ABONOS).add(getValorBigDecimal(bean.getAbonos())));
+		bean.setBoletos(rset.getBigDecimal(FIELD_BOLETOS).add(getValorBigDecimal(bean.getBoletos())));
+		bean.setPasajerosTransportados(rset.getInt(FIELD_PASSAGEIROS_TRANSP) + (bean.getPasajerosTransportados() == null ? 0 : bean.getPasajerosTransportados()));
+		bean.setKmOnibusArrendados(rset.getBigDecimal(FIELD_KM_ONIBUS_ARRENDADOS).add(getValorBigDecimal(bean.getKmOnibusArrendados())));
+		bean.setKmOnibusProprio(rset.getBigDecimal(FIELD_KM_ONIBUS_PROPRIO).add(getValorBigDecimal(bean.getKmOnibusProprio())));
+		bean.setKmTotal(rset.getBigDecimal(FIELD_KM_TOTAL).add(getValorBigDecimal(bean.getKmTotal())));
+	}
+
+	private BigDecimal getValorBigDecimal(BigDecimal valor) {
+		return valor == null ? BigDecimal.ZERO : valor;
 	}
 
 	public void setLsDadosRelatorio(List<RelatorioEmpresaCorridaBean> lsDadosRelatorio) {
@@ -136,72 +140,92 @@ public class RelatorioEmpresaCorrida extends Relatorio {
 	protected void processaParametros() throws Exception {
 	}
 
-	private RelatorioEmpresaCorridaBean buscarRelatorioEmpresaCorrida(
-			List<RelatorioEmpresaCorridaBean> lsDadosRelatorio, ResultSet rset) throws SQLException {
-		for (RelatorioEmpresaCorridaBean rec : lsDadosRelatorio) {
-			if (filtraEmpresaCorrida(rec, rset)) {
-				return rec;
-			}
-		}
-		return null;
-	}
-
-	protected boolean filtraEmpresaCorrida(RelatorioEmpresaCorridaBean rec, ResultSet rset) throws SQLException {
-		return rec.getRutaId().equals(rset.getInt(FIELD_RUTA_ID));
-	}
-
 	protected String getSql(String empresa) {
-
 		StringBuilder sql = new StringBuilder();
+		
 		sql.append("SELECT ");
 		sql.append("    e.empresa_id, ");
 		sql.append("    e.nombempresa, ");
 		sql.append("    r.ruta_id, ");
 		sql.append("    r.descruta AS linea, ");
-		sql.append("    COALESCE(SUM(CASE WHEN (cat.grupocategoria_id IS NULL OR cat.grupocategoria_id <> 4) THEN b.preciopagado ELSE 0 END), 0) boletos, ");
-		sql.append("    COALESCE(SUM(CASE WHEN cat.grupocategoria_id = 4 THEN b.preciopagado ELSE 0 END), 0) abonos, ");
-		sql.append("    COUNT(b.boleto_id) passageirosTransp ");
-		sql.append("FROM ruta r ");
-		sql.append("LEFT JOIN corrida c ON c.ruta_id = r.ruta_id ");
+		sql.append("    coalesce(b.boletos, 0) boletos, ");
+		sql.append("    coalesce(b.abonos, 0) abonos, ");
+		sql.append("    coalesce(b.passageirostransp, 0) passageirostransp, ");
+		sql.append("    TO_CHAR(c.feccorrida, 'dd/mm/yyyy') dataCorrida, "); 
+		sql.append("    TO_CHAR(c.fechorsalida, 'hh24:mi') turnoOrigem, "); 
+		sql.append("    po.descparada origem, "); 
+		sql.append("    pd.descparada destino, ");
+		sql.append("	c.corrida_id, ");
+		sql.append("	coalesce(SUM(t.cantkmreal),0) kmtotal, "); 
+		sql.append("	coalesce(SUM("); 
+		sql.append("			CASE "); 
+		sql.append("            WHEN a.empresa_id = c.empresacorrida_id THEN t.cantkmreal "); 
+		sql.append("              ELSE 0 "); 
+		sql.append("            END "); 
+		sql.append("		    ),0) kmonibusproprio, "); 
+		sql.append("    coalesce(SUM("); 
+		sql.append("            CASE "); 
+		sql.append("                WHEN a.empresa_id <> c.empresacorrida_id THEN t.cantkmreal "); 
+		sql.append("                ELSE 0 "); 
+		sql.append("            END"); 
+		sql.append("            ),0) kmonibusarrendados ");
+		sql.append("FROM corrida c ");
+		sql.append("INNER JOIN ruta r ON c.ruta_id = r.ruta_id ");
+		sql.append("INNER JOIN corrida_tramo ct ON ct.corrida_id = c.corrida_id "); 
+		sql.append("                            AND c.feccorrida = ct.feccorrida ");
+		sql.append("INNER JOIN tramo t ON t.tramo_id = ct.tramo_id ");
+		sql.append("INNER JOIN autobus a ON a.autobus_id = ct.autobus_id ");
 		sql.append("INNER JOIN marca m ON  m.marca_id = c.marca_id ");
 		sql.append("INNER JOIN empresa e ON  e.empresa_id = m.empresa_id ");
-		sql.append("LEFT JOIN boleto b ON b.corrida_id = c.corrida_id AND b.feccorrida = c.feccorrida AND b.motivocancelacion_id IS NULL ");
-		sql.append("LEFT JOIN categoria cat ON cat.categoria_id = b.categoria_id ");
+		sql.append("LEFT JOIN ( ");
+		sql.append("			SELECT ");
+		sql.append("			COALESCE(SUM("); 
+		sql.append("				CASE WHEN(cat.grupocategoria_id IS NULL OR cat.grupocategoria_id <> 4) THEN ");
+		sql.append("						bo.preciopagado "); 
+		sql.append("					ELSE 0 "); 
+		sql.append("				END"); 
+		sql.append("			),0) boletos, "); 
+		sql.append("			COALESCE(SUM("); 
+		sql.append("				CASE WHEN cat.grupocategoria_id = 4 THEN bo.preciopagado "); 
+		sql.append("					ELSE 0 "); 
+		sql.append("				END"); 
+		sql.append("			),0) abonos, "); 
+		sql.append("			COUNT(bo.boleto_id) passageirostransp, "); 
+		sql.append("			bo.boleto_id, "); 
+		sql.append("			bo.corrida_id, "); 
+		sql.append("			bo.feccorrida, "); 
+		sql.append("			bo.motivocancelacion_id "); 
+		sql.append("			FROM boleto bo    "); 
+		sql.append("			LEFT JOIN categoria cat ON cat.categoria_id = bo.categoria_id "); 
+		sql.append("			GROUP BY bo.boleto_id, "); 
+		sql.append("			bo.corrida_id, "); 
+		sql.append("			bo.feccorrida, "); 
+		sql.append("			bo.motivocancelacion_id) b "); 
+		sql.append("			on b.corrida_id = c.corrida_id "); 
+		sql.append("			                      AND b.feccorrida = c.feccorrida "); 
+		sql.append("			                      AND b.motivocancelacion_id IS NULL ");
+		sql.append("LEFT JOIN parada po ON po.parada_id = c.origen_id ");
+		sql.append("LEFT JOIN parada pd ON pd.parada_id = c.destino_id ");
 		sql.append("WHERE c.activo <> 0 ");
 		sql.append("AND r.activo = 1 ");
+		sql.append("AND ct.activo = 1 ");
 		sql.append(StringUtils.isBlank(empresa) ? "" : "AND e.empresa_id  = :empresa_id  ");
 		sql.append("AND c.FECCORRIDA BETWEEN to_date(:fecInicio, 'DD/MM/YYYY HH24:Mi:SS') AND to_date(:fecFinal, 'DD/MM/YYYY HH24:Mi:SS') ");
 		sql.append("GROUP BY ");
 		sql.append("    e.empresa_id, ");
 		sql.append("    e.nombempresa, ");
 		sql.append("    r.ruta_id, ");
-		sql.append("    r.descruta ");
+		sql.append("    r.descruta, ");
+		sql.append("    TO_CHAR(c.feccorrida, 'dd/mm/yyyy'), ");
+		sql.append("    po.descparada, ");
+		sql.append("    pd.descparada, ");
+		sql.append("    TO_CHAR(c.fechorsalida, 'hh24:mi'), ");
+		sql.append("	c.corrida_id, ");
+		sql.append("	coalesce(b.boletos, 0), "); 
+		sql.append("	coalesce(b.abonos, 0), "); 
+		sql.append("	coalesce(b.passageirostransp, 0)");
 		sql.append("ORDER BY r.ruta_id ");
-
-		return sql.toString();
-	}
-
-	protected String getSqlKm(String empresa) {
-
-		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT ");
-		sql.append("c.ruta_id                      ruta_id, ");
-		sql.append("COALESCE(SUM(t.cantkmreal), 0) kmtotal, ");
-		sql.append("COALESCE(SUM(CASE WHEN a.empresa_id = c.empresacorrida_id THEN t.cantkmreal ELSE 0 END), 0) kmOnibusProprio, ");
-		sql.append("COALESCE(SUM(CASE WHEN a.empresa_id <> c.empresacorrida_id THEN t.cantkmreal ELSE 0 END), 0) kmOnibusArrendados ");
-		sql.append("FROM corrida c ");
-		sql.append("INNER JOIN corrida_tramo ct ON ct.corrida_id = c.corrida_id AND c.feccorrida = ct.feccorrida ");
-		sql.append("INNER JOIN tramo t ON t.tramo_id = ct.tramo_id ");
-		sql.append("INNER JOIN autobus a ON a.autobus_id = ct.autobus_id ");
-		sql.append("INNER JOIN marca m ON  m.marca_id = c.marca_id ");
-		sql.append("INNER JOIN empresa e ON  e.empresa_id = m.empresa_id ");
-		sql.append("WHERE c.activo <> 0 ");
-		sql.append("AND ct.activo = 1 ");
-		sql.append(StringUtils.isBlank(empresa) ? "" : "AND e.empresa_id = :empresa_id  ");
-		sql.append("AND c.FECCORRIDA BETWEEN :fecInicio AND :fecFinal ");
-		sql.append("GROUP BY c.ruta_id ");
-		sql.append("ORDER BY c.ruta_id ");
-
+		
 		return sql.toString();
 	}
 
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorridaNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorridaNovoLayout.java
index eabacafca..2feeb28b5 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorridaNovoLayout.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorridaNovoLayout.java
@@ -3,6 +3,7 @@ package com.rjconsultores.ventaboletos.relatorios.impl;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
@@ -15,6 +16,15 @@ public class RelatorioEmpresaCorridaNovoLayout extends RelatorioEmpresaCorrida {
 		super(parametros, conexao);
 	}
 	
+	@Override
+	protected void setDadosRelatorio(ResultSet rset, List<RelatorioEmpresaCorridaBean> lsDadosRelatorio) throws SQLException {
+		while (rset.next()) {
+			RelatorioEmpresaCorridaBean bean = new RelatorioEmpresaCorridaBean();
+			setDadosBean(rset, bean);
+			lsDadosRelatorio.add(bean);
+		}
+	}
+	
 	@Override
 	protected void setDadosBean(ResultSet rset, RelatorioEmpresaCorridaBean bean) throws SQLException {
 		super.setDadosBean(rset, bean);
@@ -24,81 +34,5 @@ public class RelatorioEmpresaCorridaNovoLayout extends RelatorioEmpresaCorrida {
 		bean.setOrigem(StringUtils.defaultString(rset.getString(FIELD_ORIGEM)));
 		bean.setDestino(StringUtils.defaultString(rset.getString(FIELD_DESTINO)));
 	}
-	
-	@Override
-	protected String getSql(String empresa) {
-		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT ");
-		sql.append("    e.empresa_id, ");
-		sql.append("    e.nombempresa, ");
-		sql.append("    r.ruta_id, ");
-		sql.append("    r.descruta AS linea, ");
-		sql.append("    COALESCE(SUM(CASE WHEN (cat.grupocategoria_id IS NULL OR cat.grupocategoria_id <> 4) THEN b.preciopagado ELSE 0 END), 0) boletos, ");
-		sql.append("    COALESCE(SUM(CASE WHEN cat.grupocategoria_id = 4 THEN b.preciopagado ELSE 0 END), 0) abonos, ");
-		sql.append("    COUNT(b.boleto_id) passageirosTransp, ");
-		sql.append("    TO_CHAR(c.feccorrida, 'dd/mm/yyyy') dataCorrida, "); 
-		sql.append("    TO_CHAR(c.fechorsalida, 'hh24:mi') turnoOrigem, "); 
-		sql.append("    po.descparada origem, "); 
-		sql.append("    pd.descparada destino, ");
-		sql.append("	c.corrida_id ");
-		sql.append("FROM ruta r ");
-		sql.append("LEFT JOIN corrida c ON c.ruta_id = r.ruta_id ");
-		sql.append("INNER JOIN marca m ON  m.marca_id = c.marca_id ");
-		sql.append("INNER JOIN empresa e ON  e.empresa_id = m.empresa_id ");
-		sql.append("LEFT JOIN boleto b ON b.corrida_id = c.corrida_id AND b.feccorrida = c.feccorrida AND b.motivocancelacion_id IS NULL ");
-		sql.append("LEFT JOIN categoria cat ON cat.categoria_id = b.categoria_id ");
-		sql.append("LEFT JOIN parada po ON po.parada_id = c.origen_id ");
-		sql.append("LEFT JOIN parada pd ON pd.parada_id = c.destino_id ");
-		sql.append("WHERE c.activo <> 0 ");
-		sql.append("AND r.activo = 1 ");
-		sql.append(StringUtils.isBlank(empresa) ? "" : "AND e.empresa_id  = :empresa_id  ");
-		sql.append("AND c.FECCORRIDA BETWEEN to_date(:fecInicio, 'DD/MM/YYYY HH24:Mi:SS') AND to_date(:fecFinal, 'DD/MM/YYYY HH24:Mi:SS') ");
-		sql.append("GROUP BY ");
-		sql.append("    e.empresa_id, ");
-		sql.append("    e.nombempresa, ");
-		sql.append("    r.ruta_id, ");
-		sql.append("    r.descruta, ");
-		sql.append("    TO_CHAR(c.feccorrida, 'dd/mm/yyyy'), ");
-		sql.append("    po.descparada, ");
-		sql.append("    pd.descparada, ");
-		sql.append("    TO_CHAR(c.fechorsalida, 'hh24:mi'), ");
-		sql.append("	c.corrida_id ");
-		sql.append("ORDER BY r.ruta_id ");
-
-		return sql.toString();
-	}
-	
-	@Override
-	protected String getSqlKm(String empresa) {
-		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT ");
-		sql.append("c.ruta_id   ruta_id, ");
-		sql.append("c.corrida_id, ");
-		sql.append("COALESCE(SUM(t.cantkmreal), 0) kmtotal, ");
-		sql.append("COALESCE(SUM(CASE WHEN a.empresa_id = c.empresacorrida_id THEN t.cantkmreal ELSE 0 END), 0) kmOnibusProprio, ");
-		sql.append("COALESCE(SUM(CASE WHEN a.empresa_id <> c.empresacorrida_id THEN t.cantkmreal ELSE 0 END), 0) kmOnibusArrendados, ");
-		sql.append("TO_CHAR(c.feccorrida,'dd/mm/yyyy') datacorrida ");
-		sql.append("FROM corrida c ");
-		sql.append("INNER JOIN corrida_tramo ct ON ct.corrida_id = c.corrida_id AND c.feccorrida = ct.feccorrida ");
-		sql.append("INNER JOIN tramo t ON t.tramo_id = ct.tramo_id ");
-		sql.append("INNER JOIN autobus a ON a.autobus_id = ct.autobus_id ");
-		sql.append("INNER JOIN marca m ON  m.marca_id = c.marca_id ");
-		sql.append("INNER JOIN empresa e ON  e.empresa_id = m.empresa_id ");
-		sql.append("WHERE c.activo <> 0 ");
-		sql.append("AND ct.activo = 1 ");
-		sql.append(StringUtils.isBlank(empresa) ? "" : "AND e.empresa_id = :empresa_id  ");
-		sql.append("AND c.FECCORRIDA BETWEEN :fecInicio AND :fecFinal ");
-		sql.append("GROUP BY c.ruta_id, ");
-		sql.append("c.corrida_id, ");
-		sql.append("TO_CHAR(c.feccorrida,'dd/mm/yyyy') ");
-		sql.append("ORDER BY c.ruta_id ");
-
-		return sql.toString();
-	}
-
-	@Override
-	protected boolean filtraEmpresaCorrida(RelatorioEmpresaCorridaBean rec, ResultSet rset) throws SQLException {
-		return rec.getCorridaId().equals(rset.getInt(FIELD_CORRIDA_ID));
-	}
 
 }
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jasper
index 9ce8a3738b4170df588ca2eed29b76a32e5482f3..71b4839ce96a940686f639d94a413177abfa5e58 100644
GIT binary patch
delta 5777
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
Yps1Yfo1Br`!e5>TUE$G4Xe1c@FM56|7ytkO

delta 5595
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
D!$0}1

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml
index 9b8619463..c7d03e5cd 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml
@@ -8,7 +8,7 @@
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.4" value="groupFooter"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.group.4" value="empresa"/>
 	<property name="ireport.zoom" value="1.3636363636363635"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="60"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.remove.emtpy.space.between.columns" value="true"/>
 	<property name="net.sf.jasperreports.export.xls.remove.emtpy.space.between.rows" value="true"/>
@@ -27,9 +27,9 @@
 	<field name="linea" class="java.lang.String"/>
 	<field name="boletos" class="java.math.BigDecimal"/>
 	<field name="abonos" class="java.math.BigDecimal"/>
-	<field name="kmOnibusProprio" class="java.lang.Integer"/>
-	<field name="kmOnibusArrendados" class="java.lang.Integer"/>
-	<field name="kmTotal" class="java.lang.Integer"/>
+	<field name="kmOnibusProprio" class="java.math.BigDecimal"/>
+	<field name="kmOnibusArrendados" class="java.math.BigDecimal"/>
+	<field name="kmTotal" class="java.math.BigDecimal"/>
 	<field name="pasajerosTransportados" class="java.lang.Integer"/>
 	<field name="empresa" class="java.lang.String"/>
 	<variable name="sum.boletos" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
@@ -38,13 +38,13 @@
 	<variable name="sum.abonos" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
 		<variableExpression><![CDATA[$F{abonos}]]></variableExpression>
 	</variable>
-	<variable name="sum.kmOnibusProprio" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum">
+	<variable name="sum.kmOnibusProprio" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
 		<variableExpression><![CDATA[$F{kmOnibusProprio}]]></variableExpression>
 	</variable>
-	<variable name="sum.kmOnibusArrendados" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum">
+	<variable name="sum.kmOnibusArrendados" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
 		<variableExpression><![CDATA[$F{kmOnibusArrendados}]]></variableExpression>
 	</variable>
-	<variable name="sum.kmTotal" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum">
+	<variable name="sum.kmTotal" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
 		<variableExpression><![CDATA[$F{kmTotal}]]></variableExpression>
 	</variable>
 	<variable name="sum.pasajerosTransportados" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum">
@@ -131,7 +131,7 @@
 				<textField pattern="#,##0.00" isBlankWhenNull="true">
 					<reportElement uuid="96095298-1c13-4089-8a8b-fd324b377e45" x="131" y="3" width="61" height="16"/>
 					<textElement textAlignment="Center">
-						<font size="10"/>
+						<font size="8"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.boletos}]]></textFieldExpression>
 				</textField>
@@ -140,27 +140,37 @@
 				</line>
 				<textField pattern="#,##0.00">
 					<reportElement uuid="354a3daa-dbb6-45c0-93c3-b9c4f485cbb5" x="192" y="3" width="59" height="16"/>
-					<textElement textAlignment="Center"/>
+					<textElement textAlignment="Center">
+						<font size="8"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.abonos}]]></textFieldExpression>
 				</textField>
-				<textField>
+				<textField pattern="#,##0.00">
 					<reportElement uuid="2f518abc-f4b9-411b-bb4f-5e58c0a2b301" x="326" y="3" width="73" height="16"/>
-					<textElement textAlignment="Center"/>
+					<textElement textAlignment="Center">
+						<font size="8"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.kmOnibusProprio}]]></textFieldExpression>
 				</textField>
-				<textField>
+				<textField pattern="#,##0.00">
 					<reportElement uuid="6ce0a6db-3435-4ef2-be61-273af168410f" x="399" y="3" width="88" height="16"/>
-					<textElement textAlignment="Center"/>
+					<textElement textAlignment="Center">
+						<font size="8"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.kmOnibusArrendados}]]></textFieldExpression>
 				</textField>
-				<textField>
+				<textField pattern="#,##0.00">
 					<reportElement uuid="3abc13c1-b7df-49e7-977a-c49638f639c2" x="487" y="3" width="68" height="16"/>
-					<textElement textAlignment="Center"/>
+					<textElement textAlignment="Center">
+						<font size="8"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.kmTotal}]]></textFieldExpression>
 				</textField>
 				<textField>
 					<reportElement uuid="9a3560b6-4371-4d7c-9336-f7578ccadda8" x="251" y="3" width="75" height="16"/>
-					<textElement textAlignment="Center"/>
+					<textElement textAlignment="Center">
+						<font size="8"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.pasajerosTransportados}]]></textFieldExpression>
 				</textField>
 			</band>
@@ -280,7 +290,7 @@
 	</columnHeader>
 	<detail>
 		<band height="17" splitType="Stretch">
-			<textField isBlankWhenNull="true">
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" stretchType="RelativeToTallestObject" x="487" y="0" width="68" height="17"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
@@ -296,7 +306,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{abonos}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" stretchType="RelativeToTallestObject" x="399" y="0" width="88" height="17"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
@@ -312,7 +322,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{linea}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField pattern="#,##0.00">
 				<reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" stretchType="RelativeToTallestObject" x="326" y="0" width="73" height="17"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
@@ -336,7 +346,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pasajerosTransportados}]]></textFieldExpression>
 			</textField>
-			<textField pattern="" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
 				<reportElement uuid="b933abbd-d3f7-4164-a61d-0ffb2c3e4d73" stretchType="RelativeToTallestObject" x="0" y="0" width="59" height="17"/>
 				<textElement textAlignment="Left">
 					<font size="7"/>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jasper
index af0bd6abede735bf2b56146bca837871140ec26c..c272baf96df87fec4f064a412b9d1b2f0780e648 100644
GIT binary patch
delta 7434
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
Z+51{L@3~h^*7TW5@L+xsfBE&9{|C-{{H6c^

delta 7531
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jrxml
index 7a153352d..7e213c73f 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jrxml
@@ -7,8 +7,8 @@
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.group.3" value="empresa"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.4" value="groupFooter"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.group.4" value="empresa"/>
-	<property name="ireport.zoom" value="1.8150000000000004"/>
-	<property name="ireport.x" value="85"/>
+	<property name="ireport.zoom" value="1.3636363636363638"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.remove.emtpy.space.between.columns" value="true"/>
 	<property name="net.sf.jasperreports.export.xls.remove.emtpy.space.between.rows" value="true"/>
@@ -27,9 +27,9 @@
 	<field name="linea" class="java.lang.String"/>
 	<field name="boletos" class="java.math.BigDecimal"/>
 	<field name="abonos" class="java.math.BigDecimal"/>
-	<field name="kmOnibusProprio" class="java.lang.Integer"/>
-	<field name="kmOnibusArrendados" class="java.lang.Integer"/>
-	<field name="kmTotal" class="java.lang.Integer"/>
+	<field name="kmOnibusProprio" class="java.math.BigDecimal"/>
+	<field name="kmOnibusArrendados" class="java.math.BigDecimal"/>
+	<field name="kmTotal" class="java.math.BigDecimal"/>
 	<field name="pasajerosTransportados" class="java.lang.Integer"/>
 	<field name="empresa" class="java.lang.String"/>
 	<field name="origem" class="java.lang.String"/>
@@ -42,13 +42,13 @@
 	<variable name="sum.abonos" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
 		<variableExpression><![CDATA[$F{abonos}]]></variableExpression>
 	</variable>
-	<variable name="sum.kmOnibusProprio" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum">
+	<variable name="sum.kmOnibusProprio" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
 		<variableExpression><![CDATA[$F{kmOnibusProprio}]]></variableExpression>
 	</variable>
-	<variable name="sum.kmOnibusArrendados" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum">
+	<variable name="sum.kmOnibusArrendados" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
 		<variableExpression><![CDATA[$F{kmOnibusArrendados}]]></variableExpression>
 	</variable>
-	<variable name="sum.kmTotal" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum">
+	<variable name="sum.kmTotal" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
 		<variableExpression><![CDATA[$F{kmTotal}]]></variableExpression>
 	</variable>
 	<variable name="sum.pasajerosTransportados" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum">
@@ -66,40 +66,40 @@
 					<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="e8355048-a037-4837-866b-e6cf7a3e90ed" stretchType="RelativeToTallestObject" x="319" y="20" width="46" height="22"/>
+					<reportElement uuid="e8355048-a037-4837-866b-e6cf7a3e90ed" stretchType="RelativeToTallestObject" x="313" y="20" width="46" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 						<paragraph firstLineIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.abonos}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="d88253ec-b6d4-4e99-b677-3c1a0b273a81" stretchType="RelativeToTallestObject" x="273" y="20" width="46" height="22"/>
+					<reportElement uuid="d88253ec-b6d4-4e99-b677-3c1a0b273a81" stretchType="RelativeToTallestObject" x="264" y="20" width="49" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.boletos}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement uuid="569add1e-cb73-4278-b800-fa44631527f6" stretchType="RelativeToTallestObject" x="463" y="20" width="45" height="22"/>
+					<reportElement uuid="569add1e-cb73-4278-b800-fa44631527f6" stretchType="RelativeToTallestObject" x="450" y="20" width="45" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 						<paragraph firstLineIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.kmOnibusArrendados}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement uuid="31387dbf-1cdc-4c27-992f-2e439abea576" stretchType="RelativeToTallestObject" x="423" y="20" width="40" height="22"/>
+					<reportElement uuid="31387dbf-1cdc-4c27-992f-2e439abea576" stretchType="RelativeToTallestObject" x="404" y="20" width="45" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 						<paragraph leftIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.kmOnibusProprio}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="12ef050d-3938-4dd6-8e82-bfeca7adaa2a" stretchType="RelativeToTallestObject" x="49" y="20" width="51" height="22"/>
+					<reportElement uuid="12ef050d-3938-4dd6-8e82-bfeca7adaa2a" stretchType="RelativeToTallestObject" x="39" y="20" width="51" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 						<paragraph leftIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.linea}]]></textFieldExpression>
@@ -113,49 +113,49 @@
 					<textFieldExpression><![CDATA[$R{header.km.grupo}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement uuid="73c02335-4bbe-44ba-9c73-1201ed6b3967" stretchType="RelativeToTallestObject" x="365" y="20" width="58" height="22"/>
+					<reportElement uuid="73c02335-4bbe-44ba-9c73-1201ed6b3967" stretchType="RelativeToTallestObject" x="359" y="20" width="45" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 						<paragraph firstLineIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.pasajerosTransportados}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement uuid="edd89ef1-92d6-4b5f-b249-851532fad9df" stretchType="RelativeToTallestObject" x="508" y="20" width="47" height="22"/>
+					<reportElement uuid="edd89ef1-92d6-4b5f-b249-851532fad9df" stretchType="RelativeToTallestObject" x="495" y="20" width="60" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 						<paragraph firstLineIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.kmTotal}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement uuid="edc6a77e-c068-4251-bb3e-1f08004eb5bf" stretchType="RelativeToTallestObject" x="100" y="20" width="51" height="22"/>
+					<reportElement uuid="edc6a77e-c068-4251-bb3e-1f08004eb5bf" stretchType="RelativeToTallestObject" x="90" y="20" width="52" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 						<paragraph leftIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.dataCorrida}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement uuid="15a278aa-451b-4c74-8b9c-15262c6f88f6" stretchType="RelativeToTallestObject" x="151" y="20" width="41" height="22"/>
+					<reportElement uuid="15a278aa-451b-4c74-8b9c-15262c6f88f6" stretchType="RelativeToTallestObject" x="142" y="20" width="41" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 						<paragraph leftIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.turnoOrigem}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement uuid="1f69061d-585c-4aee-aeba-17c3cf06734e" stretchType="RelativeToTallestObject" x="192" y="20" width="40" height="22"/>
+					<reportElement uuid="1f69061d-585c-4aee-aeba-17c3cf06734e" stretchType="RelativeToTallestObject" x="183" y="20" width="40" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 						<paragraph leftIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.origem}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement uuid="ff19c95a-f2a3-4e55-b02e-07cc660acc14" stretchType="RelativeToTallestObject" x="232" y="20" width="41" height="22"/>
+					<reportElement uuid="ff19c95a-f2a3-4e55-b02e-07cc660acc14" stretchType="RelativeToTallestObject" x="223" y="20" width="41" height="22"/>
 					<textElement markup="none">
-						<font size="9"/>
+						<font size="8"/>
 						<paragraph leftIndent="2"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
@@ -165,9 +165,9 @@
 		<groupFooter>
 			<band height="23">
 				<textField pattern="#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="96095298-1c13-4089-8a8b-fd324b377e45" x="273" y="3" width="46" height="16"/>
+					<reportElement uuid="96095298-1c13-4089-8a8b-fd324b377e45" x="264" y="3" width="49" height="16"/>
 					<textElement textAlignment="Center">
-						<font size="10"/>
+						<font size="7"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.boletos}]]></textFieldExpression>
 				</textField>
@@ -175,28 +175,38 @@
 					<reportElement uuid="6cef9de7-7dee-488b-aea7-3d02a8e3634a" x="0" y="0" width="555" height="1"/>
 				</line>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="354a3daa-dbb6-45c0-93c3-b9c4f485cbb5" x="319" y="3" width="46" height="16"/>
-					<textElement textAlignment="Center"/>
+					<reportElement uuid="354a3daa-dbb6-45c0-93c3-b9c4f485cbb5" x="313" y="3" width="46" height="16"/>
+					<textElement textAlignment="Center">
+						<font size="7"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.abonos}]]></textFieldExpression>
 				</textField>
-				<textField>
-					<reportElement uuid="2f518abc-f4b9-411b-bb4f-5e58c0a2b301" x="423" y="3" width="40" height="16"/>
-					<textElement textAlignment="Center"/>
+				<textField pattern="#,##0.00">
+					<reportElement uuid="2f518abc-f4b9-411b-bb4f-5e58c0a2b301" x="404" y="3" width="45" height="16"/>
+					<textElement textAlignment="Center">
+						<font size="7"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.kmOnibusProprio}]]></textFieldExpression>
 				</textField>
-				<textField>
-					<reportElement uuid="6ce0a6db-3435-4ef2-be61-273af168410f" x="463" y="3" width="45" height="16"/>
-					<textElement textAlignment="Center"/>
+				<textField pattern="#,##0.00">
+					<reportElement uuid="6ce0a6db-3435-4ef2-be61-273af168410f" x="450" y="3" width="45" height="16"/>
+					<textElement textAlignment="Center">
+						<font size="7"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.kmOnibusArrendados}]]></textFieldExpression>
 				</textField>
-				<textField>
-					<reportElement uuid="3abc13c1-b7df-49e7-977a-c49638f639c2" x="508" y="3" width="47" height="16"/>
-					<textElement textAlignment="Center"/>
+				<textField pattern="#,##0.00">
+					<reportElement uuid="3abc13c1-b7df-49e7-977a-c49638f639c2" x="495" y="3" width="60" height="16"/>
+					<textElement textAlignment="Center">
+						<font size="7"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.kmTotal}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="9a3560b6-4371-4d7c-9336-f7578ccadda8" x="365" y="3" width="58" height="16"/>
-					<textElement textAlignment="Center"/>
+					<reportElement uuid="9a3560b6-4371-4d7c-9336-f7578ccadda8" x="359" y="3" width="45" height="16"/>
+					<textElement textAlignment="Center">
+						<font size="7"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum.pasajerosTransportados}]]></textFieldExpression>
 				</textField>
 			</band>
@@ -208,7 +218,7 @@
 	<title>
 		<band height="39">
 			<textField>
-				<reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="19" width="49" height="20"/>
+				<reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="19" width="39" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression>
 			</textField>
@@ -225,7 +235,7 @@
 				<textFieldExpression><![CDATA[$R{header.pagina}+" "+$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="49" y="19" width="395" height="20"/>
+				<reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="40" y="19" width="404" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression>
 			</textField>
@@ -251,95 +261,95 @@
 	<columnHeader>
 		<band height="22" splitType="Stretch">
 			<textField>
-				<reportElement uuid="f5729d81-df6a-4612-b01d-d43ce1008f3f" stretchType="RelativeToTallestObject" x="508" y="0" width="47" height="22"/>
+				<reportElement uuid="f5729d81-df6a-4612-b01d-d43ce1008f3f" stretchType="RelativeToTallestObject" x="495" y="0" width="60" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 					<paragraph firstLineIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.kmTotal}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="e0126182-4184-40df-898c-71babec8c9ac" stretchType="RelativeToTallestObject" x="365" y="0" width="58" height="22"/>
+				<reportElement uuid="e0126182-4184-40df-898c-71babec8c9ac" stretchType="RelativeToTallestObject" x="359" y="0" width="45" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 					<paragraph firstLineIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.pasajerosTransportados}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="1ab856e3-3db6-43af-9241-f52d67972d8f" stretchType="RelativeToTallestObject" x="319" y="0" width="46" height="22"/>
+				<reportElement uuid="1ab856e3-3db6-43af-9241-f52d67972d8f" stretchType="RelativeToTallestObject" x="313" y="0" width="46" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 					<paragraph firstLineIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.abonos}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="192f95fb-fc2c-4872-b0a4-00d0675a9882" stretchType="RelativeToTallestObject" x="273" y="0" width="46" height="22"/>
+				<reportElement uuid="192f95fb-fc2c-4872-b0a4-00d0675a9882" stretchType="RelativeToTallestObject" x="264" y="0" width="49" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.boletos}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="76ea0944-2fed-4c0f-a436-77489c8bb755" stretchType="RelativeToTallestObject" x="423" y="0" width="40" height="22"/>
+				<reportElement uuid="76ea0944-2fed-4c0f-a436-77489c8bb755" stretchType="RelativeToTallestObject" x="404" y="0" width="40" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.kmOnibusProprio}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="bc11eaed-fff3-4d98-b397-25e43e398699" stretchType="RelativeToTallestObject" x="463" y="0" width="45" height="22"/>
+				<reportElement uuid="bc11eaed-fff3-4d98-b397-25e43e398699" stretchType="RelativeToTallestObject" x="450" y="0" width="45" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 					<paragraph firstLineIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.kmOnibusArrendados}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="140d9378-b983-4eef-bb17-9dbdc80d324a" stretchType="RelativeToTallestObject" x="49" y="0" width="51" height="22"/>
+				<reportElement uuid="140d9378-b983-4eef-bb17-9dbdc80d324a" stretchType="RelativeToTallestObject" x="39" y="0" width="51" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.linea}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="1e959efc-f066-48df-94d1-5ab4ba7fb79e" stretchType="RelativeToTallestObject" x="0" y="0" width="49" height="22"/>
+				<reportElement uuid="1e959efc-f066-48df-94d1-5ab4ba7fb79e" stretchType="RelativeToTallestObject" x="0" y="0" width="39" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 				</textElement>
 				<text><![CDATA[Empresa]]></text>
 			</staticText>
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="57b90a8d-7cab-4256-a814-87c298307204" stretchType="RelativeToTallestObject" x="151" y="0" width="41" height="22"/>
+				<reportElement uuid="57b90a8d-7cab-4256-a814-87c298307204" stretchType="RelativeToTallestObject" x="142" y="0" width="41" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.turnoOrigem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="2df70287-7eb7-4551-af67-a2df2f9cac76" stretchType="RelativeToTallestObject" x="100" y="0" width="51" height="22"/>
+				<reportElement uuid="2df70287-7eb7-4551-af67-a2df2f9cac76" stretchType="RelativeToTallestObject" x="90" y="0" width="52" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.dataCorrida}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="a7498aa9-7e4c-4987-8da4-6aa7d354f680" stretchType="RelativeToTallestObject" x="232" y="0" width="41" height="22"/>
+				<reportElement uuid="a7498aa9-7e4c-4987-8da4-6aa7d354f680" stretchType="RelativeToTallestObject" x="223" y="0" width="41" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement uuid="fa7a55df-3f22-4bd3-bda4-98e3cae73b6f" stretchType="RelativeToTallestObject" x="192" y="0" width="40" height="22"/>
+				<reportElement uuid="fa7a55df-3f22-4bd3-bda4-98e3cae73b6f" stretchType="RelativeToTallestObject" x="183" y="0" width="40" height="22"/>
 				<textElement markup="none">
-					<font size="9"/>
+					<font size="8"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.origem}]]></textFieldExpression>
@@ -348,8 +358,8 @@
 	</columnHeader>
 	<detail>
 		<band height="18" splitType="Stretch">
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" stretchType="RelativeToTallestObject" x="508" y="0" width="47" height="17"/>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" stretchType="RelativeToTallestObject" x="495" y="0" width="60" height="17"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
@@ -357,15 +367,15 @@
 				<textFieldExpression><![CDATA[$F{kmTotal}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" stretchType="RelativeToTallestObject" x="319" y="0" width="46" height="17"/>
+				<reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" stretchType="RelativeToTallestObject" x="313" y="0" width="46" height="17"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{abonos}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" stretchType="RelativeToTallestObject" x="463" y="0" width="45" height="17"/>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" stretchType="RelativeToTallestObject" x="450" y="0" width="45" height="17"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
@@ -373,15 +383,15 @@
 				<textFieldExpression><![CDATA[$F{kmOnibusArrendados}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" stretchType="RelativeToTallestObject" x="49" y="0" width="51" height="17"/>
+				<reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" stretchType="RelativeToTallestObject" x="39" y="0" width="51" height="17"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{linea}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" stretchType="RelativeToTallestObject" x="423" y="0" width="40" height="17"/>
+			<textField pattern="#,##0.00">
+				<reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" stretchType="RelativeToTallestObject" x="404" y="0" width="45" height="17"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
@@ -389,7 +399,7 @@
 				<textFieldExpression><![CDATA[$F{kmOnibusProprio}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="false">
-				<reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" stretchType="RelativeToTallestObject" x="273" y="0" width="46" height="17"/>
+				<reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" stretchType="RelativeToTallestObject" x="264" y="0" width="49" height="17"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
@@ -397,23 +407,23 @@
 				<textFieldExpression><![CDATA[$F{boletos}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" stretchType="RelativeToTallestObject" x="365" y="0" width="58" height="17"/>
+				<reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" stretchType="RelativeToTallestObject" x="359" y="0" width="45" height="17"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pasajerosTransportados}]]></textFieldExpression>
 			</textField>
-			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="b933abbd-d3f7-4164-a61d-0ffb2c3e4d73" stretchType="RelativeToTallestObject" x="0" y="0" width="49" height="17"/>
+			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
+				<reportElement uuid="b933abbd-d3f7-4164-a61d-0ffb2c3e4d73" stretchType="RelativeToTallestObject" x="0" y="0" width="39" height="17"/>
 				<textElement textAlignment="Left">
-					<font size="7"/>
+					<font size="8"/>
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="c263b8a0-59ed-444b-ac4c-5bc075c5aa35" stretchType="RelativeToTallestObject" x="100" y="0" width="51" height="17"/>
+				<reportElement uuid="c263b8a0-59ed-444b-ac4c-5bc075c5aa35" stretchType="RelativeToTallestObject" x="90" y="0" width="52" height="17"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
@@ -421,7 +431,7 @@
 				<textFieldExpression><![CDATA[$F{dataCorrida}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="b4507261-0f9d-494e-9884-ef0e052ca100" stretchType="RelativeToTallestObject" x="151" y="0" width="41" height="17"/>
+				<reportElement uuid="b4507261-0f9d-494e-9884-ef0e052ca100" stretchType="RelativeToTallestObject" x="142" y="0" width="41" height="17"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
@@ -429,7 +439,7 @@
 				<textFieldExpression><![CDATA[$F{turnoOrigem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="11973578-f700-40c5-8e55-1d84f5f44689" stretchType="RelativeToTallestObject" x="192" y="0" width="40" height="17"/>
+				<reportElement uuid="11973578-f700-40c5-8e55-1d84f5f44689" stretchType="RelativeToTallestObject" x="183" y="0" width="40" height="17"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
@@ -437,7 +447,7 @@
 				<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="31a7ab2b-9bad-4f03-baea-32a7b1aa1dcc" stretchType="RelativeToTallestObject" x="232" y="0" width="41" height="17"/>
+				<reportElement uuid="31a7ab2b-9bad-4f03-baea-32a7b1aa1dcc" stretchType="RelativeToTallestObject" x="223" y="0" width="41" height="17"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 					<paragraph leftIndent="2"/>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java
index 65015dfdd..a1fe92494 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java
@@ -10,9 +10,9 @@ public class RelatorioEmpresaCorridaBean {
 	private String linea;
 	private BigDecimal boletos;
 	private BigDecimal abonos;
-	private Integer kmOnibusProprio;
-	private Integer kmOnibusArrendados;
-	private Integer kmTotal;
+	private BigDecimal kmOnibusProprio;
+	private BigDecimal kmOnibusArrendados;
+	private BigDecimal kmTotal;
 	private Integer pasajerosTransportados;
 	private String origem;
 	private String destino;
@@ -83,27 +83,27 @@ public class RelatorioEmpresaCorridaBean {
 		this.abonos = abonos;
 	}
 
-	public Integer getKmOnibusProprio() {
+	public BigDecimal getKmOnibusProprio() {
 		return kmOnibusProprio;
 	}
 
-	public void setKmOnibusProprio(Integer kmOnibusProprio) {
+	public void setKmOnibusProprio(BigDecimal kmOnibusProprio) {
 		this.kmOnibusProprio = kmOnibusProprio;
 	}
 
-	public Integer getKmOnibusArrendados() {
+	public BigDecimal getKmOnibusArrendados() {
 		return kmOnibusArrendados;
 	}
 
-	public void setKmOnibusArrendados(Integer kmOnibusArrendados) {
+	public void setKmOnibusArrendados(BigDecimal kmOnibusArrendados) {
 		this.kmOnibusArrendados = kmOnibusArrendados;
 	}
 
-	public Integer getKmTotal() {
+	public BigDecimal getKmTotal() {
 		return kmTotal;
 	}
 
-	public void setKmTotal(Integer kmTotal) {
+	public void setKmTotal(BigDecimal kmTotal) {
 		this.kmTotal = kmTotal;
 	}