RHL - Correções

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30027 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java

@@ -75,6 +75,8 @@ public class RelatorioLinhasHorario extends Relatorio {
 				Integer tipoServico = (Integer) parametros.get("TIPOSERVICIO_ID");
 				String sql = getSql(lsNumLinha, lsNumServico, empresa, tipoServico, grupoRuta);
 
+				System.out.println(sql);
+
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
 				ResultSet rset = null;
 
@@ -105,6 +107,9 @@ public class RelatorioLinhasHorario extends Relatorio {
 				BigDecimal totalPaxKMTransportado = BigDecimal.ZERO;
 				BigDecimal totalIAP = BigDecimal.ZERO;
 
+				BigDecimal totalTxEmbarque = BigDecimal.ZERO;
+				BigDecimal totalPedagio = BigDecimal.ZERO;
+
 				String group = null;
 				while (rset.next()) {
 					RelatorioLinhasHorarioBean horarioBean = new RelatorioLinhasHorarioBean();
@@ -112,7 +117,7 @@ public class RelatorioLinhasHorario extends Relatorio {
 					group = ((String) rset.getObject("GRUPO_RUTA"));
 
 					horarioBean.setGrupoRuta(group);
-					
+
 					horarioBean.setTipoLinha((String) rset.getObject("TIPO_LINHA"));
 
 					horarioBean.setHora((String) rset.getObject("HORA"));
@@ -124,13 +129,18 @@ public class RelatorioLinhasHorario extends Relatorio {
 						horarioBean.convetSentido(null);
 					horarioBean.setLot((BigDecimal) rset.getObject("LOT"));
 					horarioBean.setCla((String) rset.getObject("CLA"));
-					horarioBean.setExtensaoTrecho((BigDecimal) rset.getObject("EXTENSAO_TRECHO"));
 					horarioBean.setExtensao((BigDecimal) rset.getObject("EXTENSAO"));
 					horarioBean.setTarifa((BigDecimal) rset.getObject("TARIFA"));
 					horarioBean.setPassagens((BigDecimal) rset.getObject("PASSAGENS"));
 					horarioBean.setSeguro((BigDecimal) rset.getObject("SEGURO"));
 					horarioBean.setBagagens((BigDecimal) rset.getObject("BAGAGENS"));
 
+					horarioBean.setTxEmbarque((BigDecimal) rset.getObject("TX_EMBARQUE"));
+					horarioBean.setPedagio((BigDecimal) rset.getObject("PEDAGIO"));
+
+					// Substituir a coluna Seg. Opcional por Tx. Embarque
+					horarioBean.setSegOpc(horarioBean.getTxEmbarque());
+
 					horarioBean.setOrd((BigDecimal) rset.getObject("ORD"));
 					horarioBean.setExtra((BigDecimal) rset.getObject("EXTRA"));
 					horarioBean.setAbsol((BigDecimal) rset.getObject("ABSOL"));
@@ -138,8 +148,6 @@ public class RelatorioLinhasHorario extends Relatorio {
 					horarioBean.setOrigem((String) rset.getObject("ORIGEM"));
 					horarioBean.setDestino((String) rset.getObject("DESTINO"));
 
-					horarioBean.setSegOpc((BigDecimal) rset.getObject("SEGURO"));
-
 					horarioBean = trecho(horarioBean);
 
 					horarioBean = calcTotal(horarioBean);
@@ -157,8 +165,6 @@ public class RelatorioLinhasHorario extends Relatorio {
 					horarioBean = calcPaxKmTransportado(horarioBean);
 					horarioBean = calcIap(horarioBean);
 
-					horarioBean.setExtensao(horarioBean.getExtensaoTrecho());
-
 					lsDadosRelatorio.add(horarioBean);
 
 					totalPassagens = totalPassagens.add(horarioBean.getPassagens() != null ? horarioBean.getPassagens() : BigDecimal.ZERO);
@@ -173,6 +179,9 @@ public class RelatorioLinhasHorario extends Relatorio {
 					totalAbsoluto = totalAbsoluto.add(horarioBean.getAbsol() != null ? horarioBean.getAbsol() : BigDecimal.ZERO);
 					totalEquivalente = totalEquivalente.add(horarioBean.getEquivalente() != null ? horarioBean.getEquivalente() : BigDecimal.ZERO);
 
+					totalTxEmbarque = totalTxEmbarque.add(horarioBean.getTxEmbarque() != null ? horarioBean.getTxEmbarque() : BigDecimal.ZERO);
+					totalPedagio = totalPedagio.add(horarioBean.getPedagio() != null ? horarioBean.getPedagio() : BigDecimal.ZERO);
+
 					mediaMPA = mediaMPA.add(horarioBean.getMpa() != null ? horarioBean.getMpa() : BigDecimal.ZERO);
 					mediaMPE = mediaMPE.add(horarioBean.getMpe() != null ? horarioBean.getMpe() : BigDecimal.ZERO);
 
@@ -208,7 +217,8 @@ public class RelatorioLinhasHorario extends Relatorio {
 					parametros.put("MEDIA_MPE", mediaMPE.divide(qtdeRegistros, RoundingMode.HALF_EVEN));
 					parametros.put("MEDIA_RS_POR_KM", mediaRsPorKm.divide(qtdeRegistros, RoundingMode.HALF_EVEN));
 					parametros.put("TOTAL_EQ", totalEQ);
-
+					parametros.put("TOTAL_TX_EMBARQUE", totalTxEmbarque);
+					parametros.put("TOTAL_PEDAGIO", totalPedagio);
 					parametros.put("MEDIA_RS_POR_VIAGEM", mediaRSPorViagem.divide(qtdeRegistros, RoundingMode.HALF_EVEN));
 					parametros.put("TOTAL_PAX_KM_OFERTADO", totalPaxKMOfertado);
 					parametros.put("TOTAL_PAX_KM_TRANSPORTADO", totalPaxKMTransportado);
@@ -257,7 +267,7 @@ public class RelatorioLinhasHorario extends Relatorio {
 	}
 
 	private RelatorioLinhasHorarioBean calcKmRodado(RelatorioLinhasHorarioBean horarioBean) {
-		BigDecimal kmRodado = horarioBean.getTotalViagem().multiply(horarioBean.getExtensaoTrecho());
+		BigDecimal kmRodado = horarioBean.getTotalViagem().multiply(horarioBean.getExtensao());
 		horarioBean.setKmRodado(kmRodado);
 		return horarioBean;
 	}
@@ -265,7 +275,7 @@ public class RelatorioLinhasHorario extends Relatorio {
 	private RelatorioLinhasHorarioBean calcEquivalente(RelatorioLinhasHorarioBean horarioBean) {
 		BigDecimal equivalente = new BigDecimal(0);
 		try {
-			equivalente = horarioBean.getExtensao().divide(horarioBean.getExtensaoTrecho(), RoundingMode.CEILING);
+			equivalente = horarioBean.getExtensao().divide(horarioBean.getExtensao(), RoundingMode.CEILING);
 			equivalente = equivalente.multiply(horarioBean.getAbsol());
 
 		} catch (ArithmeticException e) {
@@ -303,7 +313,7 @@ public class RelatorioLinhasHorario extends Relatorio {
 
 	private RelatorioLinhasHorarioBean calcRsKm(RelatorioLinhasHorarioBean horarioBean) {
 		BigDecimal rsKm = horarioBean.getTotal().divide(horarioBean.getTotalViagem(), RoundingMode.CEILING);
-		rsKm = rsKm.multiply(horarioBean.getExtensaoTrecho());
+		rsKm = rsKm.multiply(horarioBean.getExtensao());
 		horarioBean.setRsKm(rsKm);
 		return horarioBean;
 	}
@@ -337,7 +347,7 @@ public class RelatorioLinhasHorario extends Relatorio {
 	}
 
 	private RelatorioLinhasHorarioBean calcPaxKmTransportado(RelatorioLinhasHorarioBean horarioBean) {
-		BigDecimal paxKmTransportado = horarioBean.getExtensaoTrecho().multiply(horarioBean.getEquivalente());
+		BigDecimal paxKmTransportado = horarioBean.getExtensao().multiply(horarioBean.getEquivalente());
 		horarioBean.setPaxKmTransportado(paxKmTransportado);
 		return horarioBean;
 	}
@@ -365,95 +375,86 @@ public class RelatorioLinhasHorario extends Relatorio {
 	private String getSql(ArrayList<Ruta> lsNumLinha, ArrayList<Corrida> lsNumServico, Empresa empresa, Integer tipoServico, GrupoRuta grupoRuta) {
 		StringBuffer sql = new StringBuffer();
 
-		sql.append("  SELECT  ");
+		sql.append(" SELECT R.RUTA_ID, ");
-		sql.append("       R.RUTA_ID, ");
+		sql.append("       NVL(GR.DESCGRUPO, 'NÃO POSSUI GRUPO') AS GRUPO_RUTA, ");
-		sql.append("       NVL(GR.DESCGRUPO, 'NÃO POSSUI GRUPO')  AS GRUPO_RUTA,   ");
+		sql.append("       TO_CHAR(C.FECHORSALIDA, 'HH24:MI')    AS HORA, ");
-		sql.append("       TO_CHAR(CJ.FECHORVIAJE, 'HH24:MI')  AS HORA,  ");
+		sql.append("       C.CORRIDA_ID                          AS SERVICO, ");
-		sql.append("       C.CORRIDA_ID                        AS SERVICO, ");
+		sql.append("       R.INDSENTIDOIDA                       AS SENTIDO, ");
-		sql.append("       R.INDSENTIDOIDA                     AS SENTIDO, ");
+		sql.append("       DA.CANTASIENTOS                       AS LOT, ");
-		sql.append("       DA.CANTASIENTOS                     AS LOT, ");
+		sql.append("       CS.CVECLASE                           AS CLA, ");
-		sql.append("       CS.CVECLASE                         AS CLA, ");
+		sql.append("       NVL(TF.PRECIOORIGINAL, 0)             AS TARIFA, ");
-		sql.append("       CJ.NUMKMVIAJE                       AS EXTENSAO_TRECHO, ");
+		sql.append("       ORIGEM.CVEPARADA                      AS ORIGEM, ");
+		sql.append("       DESTINO.CVEPARADA                     AS DESTINO, ");
 		sql.append("       EXTENSAO, ");
-		sql.append("       NVL(CJ.PRECIOBASE, 0)               AS TARIFA, ");
+		sql.append("       SUM(NVL(EE.IMPINGRESO, 0))            AS BAGAGENS, ");
-		sql.append("       ORIGEM.CVEPARADA                    AS ORIGEM, ");
+		sql.append("       SUM(NVL(CJ.IMPORTESEGURO, 0))         AS SEGURO, ");
-		sql.append("       DESTINO.CVEPARADA                   AS DESTINO, ");
+		sql.append("       SUM(NVL(CJ.IMPORTETAXAEMBARQUE, 0))   AS TX_EMBARQUE, ");
-		sql.append("       SUM(NVL(EE.IMPINGRESO, 0))          AS BAGAGENS, ");
+		sql.append("       SUM(NVL(CJ.IMPORTEPEDAGIO, 0))        AS PEDAGIO, ");
-		sql.append("       SUM(NVL(CJ.PRECIOPAGADO, 0))        AS PASSAGENS, ");
+		sql.append("       SUM(NVL(CJ.PRECIOPAGADO, 0))          AS PASSAGENS, ");
-		sql.append("       SUM(NVL(CJ.IMPORTESEGURO, 0))       AS SEGURO, ");
-
 		sql.append("       ORD, ");
 		sql.append("       EXTRA, ");
-
+		sql.append("       CASE ");
-		sql.append("        CASE ");
+		sql.append("         WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 'INTERESTADUAL' ");
-		sql.append("          WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN ");
+		sql.append("         ELSE 'INTERMUNICIPAL' ");
-		sql.append("           'INTERESTADUAL' ");
+		sql.append("       END                                   TIPO_LINHA, ");
-		sql.append("          ELSE ");
+		sql.append("       ABSOL ");
-		sql.append("           'INTERMUNICIPAL' ");
+		sql.append(" FROM   (SELECT RS.RUTA_ID, ");
-		sql.append("        END TIPO_LINHA, ");
-
-		sql.append("       ABSOL  ");
-
-		sql.append("  FROM   (SELECT RS.RUTA_ID, ");
 		sql.append("               SUM(NVL(T.CANTKMREAL, 0)) AS EXTENSAO ");
 		sql.append("        FROM   RUTA_SECUENCIA RS ");
-		sql.append("        INNER JOIN TRAMO T ON (RS.TRAMO_ID = T.TRAMO_ID) ");
+		sql.append("               INNER JOIN TRAMO T ");
-		sql.append("        WHERE RS.ACTIVO=1 AND T.ACTIVO=1 ");
+		sql.append("                       ON ( RS.TRAMO_ID = T.TRAMO_ID ) ");
+		sql.append("        WHERE  RS.ACTIVO = 1 ");
+		sql.append("               AND T.ACTIVO = 1 ");
 		sql.append("        GROUP  BY RS.RUTA_ID) TB1, ");
-
+		sql.append("       (SELECT C.CORRIDA_ID, ");
-		sql.append("       (SELECT C.CORRIDA_ID,   ");
 		sql.append("               COUNT(CASE ");
 		sql.append("                       WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL  ");
-		sql.append("                            AND C.TIPOSERVICIO_ID = 1 THEN 1  ");
+		sql.append("                            AND C.TIPOSERVICIO_ID = 1 THEN 1 ");
-		sql.append("                       ELSE NULL  ");
+		sql.append("                       ELSE NULL ");
-		sql.append("                     END) AS ORD  ");
+		sql.append("                     END) AS ORD ");
-		sql.append("        FROM   CORRIDA C  ");
+		sql.append("        FROM   CORRIDA C ");
-		sql.append("            WHERE C.ACTIVO = 1   ");
+		sql.append("        WHERE  C.ACTIVO = 1 ");
 		sql.append("        GROUP  BY C.CORRIDA_ID) TB2, ");
-		sql.append("       (SELECT C.CORRIDA_ID,   ");
+		sql.append("       (SELECT C.CORRIDA_ID, ");
 		sql.append("               COUNT(CASE ");
 		sql.append("                       WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL  ");
-		sql.append("                            AND C.TIPOSERVICIO_ID = 2 THEN 1  ");
+		sql.append("                            AND C.TIPOSERVICIO_ID = 2 THEN 1 ");
-		sql.append("                       ELSE NULL  ");
+		sql.append("                       ELSE NULL ");
-		sql.append("                     END) AS EXTRA  ");
+		sql.append("                     END) AS EXTRA ");
-		sql.append("        FROM   CORRIDA C  ");
+		sql.append("        FROM   CORRIDA C ");
-		sql.append("            WHERE C.ACTIVO = 1   ");
+		sql.append("        WHERE  C.ACTIVO = 1 ");
 		sql.append("        GROUP  BY C.CORRIDA_ID) TB3, ");
-
+		sql.append("       (SELECT C.CORRIDA_ID, ");
-		sql.append("       (SELECT C.CORRIDA_ID,  ");
+		sql.append("               NVL(COUNT(CASE ");
-		sql.append("                NVL(COUNT(CASE  ");
+		sql.append("                           WHEN C.FECCORRIDA  ");
-		sql.append("                       WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL  ");
+		sql.append("                                BETWEEN :DATA_INICIO AND :DATA_FINAL  THEN ");
-		sql.append("                     THEN 1  ");
+		sql.append("                           1 ");
-		sql.append("                       ELSE NULL  ");
+		sql.append("                           ELSE NULL ");
-		sql.append("                     END),0) AS ABSOL  ");
+		sql.append("                         END), 0) AS ABSOL ");
-		sql.append("        FROM   CORRIDA C  ");
+		sql.append("        FROM   CORRIDA C ");
-		sql.append("               LEFT JOIN BOLETO B  ");
+		sql.append("               LEFT JOIN BOLETO B ");
-		sql.append("                      ON ( B.CORRIDA_ID = C.CORRIDA_ID  ");
+		sql.append("                      ON ( B.CORRIDA_ID = C.CORRIDA_ID ");
-		sql.append("                           AND B.FECCORRIDA = C.FECCORRIDA )  ");
+		sql.append("                           AND B.FECCORRIDA = C.FECCORRIDA ) ");
-		sql.append("        WHERE  C.ACTIVO = 1  ");
+		sql.append("        WHERE  C.ACTIVO = 1 ");
-		sql.append("               AND B.ACTIVO = 1   ");
+		sql.append("               AND B.ACTIVO = 1 ");
-		sql.append("               AND B.MOTIVOCANCELACION_ID IS NULL  ");
+		sql.append("               AND B.MOTIVOCANCELACION_ID IS NULL ");
-		sql.append("        GROUP  BY C.CORRIDA_ID) TB4,  ");
+		sql.append("        GROUP  BY C.CORRIDA_ID) TB4, ");
-
 		sql.append("       CORRIDA C ");
 		sql.append("       LEFT JOIN CAJA CJ ");
 		sql.append("              ON ( CJ.CORRIDA_ID = C.CORRIDA_ID ");
 		sql.append("                   AND CJ.FECCORRIDA = C.FECCORRIDA ) ");
 		sql.append("       LEFT JOIN PARADA ORIGEM ");
-		sql.append("              ON ( CJ.ORIGEN_ID = ORIGEM.PARADA_ID ) ");
+		sql.append("              ON ( C.ORIGEN_ID = ORIGEM.PARADA_ID ) ");
 		sql.append("       LEFT JOIN PARADA DESTINO ");
-		sql.append("              ON ( CJ.DESTINO_ID = DESTINO.PARADA_ID ) ");
+		sql.append("              ON ( C.DESTINO_ID = DESTINO.PARADA_ID ) ");
-
 		sql.append("       LEFT OUTER JOIN CIUDAD CO ");
-		sql.append("              ON ( CO.CIUDAD_ID = ORIGEM.CIUDAD_ID ) ");
+		sql.append("                    ON ( CO.CIUDAD_ID = ORIGEM.CIUDAD_ID ) ");
-
 		sql.append("       LEFT OUTER JOIN CIUDAD CD ");
-		sql.append("              ON ( CO.CIUDAD_ID = DESTINO.CIUDAD_ID ) ");
+		sql.append("                    ON ( CO.CIUDAD_ID = DESTINO.CIUDAD_ID ) ");
-
 		sql.append("       LEFT JOIN RUTA R ");
 		sql.append("              ON ( C.RUTA_ID = R.RUTA_ID ) ");
 		sql.append("       LEFT OUTER JOIN GRUPO_RUTA GR ");
-		sql.append("              ON ( R.GRUPORUTA_ID = GR.GRUPORUTA_ID )  ");
+		sql.append("                    ON ( R.GRUPORUTA_ID = GR.GRUPORUTA_ID ) ");
 		sql.append("       LEFT JOIN ROL_OPERATIVO RO ");
 		sql.append("              ON ( C.ROLOPERATIVO_ID = RO.ROLOPERATIVO_ID ) ");
 		sql.append("       LEFT OUTER JOIN DIAGRAMA_AUTOBUS DA ");
@@ -464,11 +465,23 @@ public class RelatorioLinhasHorario extends Relatorio {
 		sql.append("              ON ( EE.CORRIDA_ID = C.CORRIDA_ID ");
 		sql.append("                   AND EE.FECCORRIDA = C.FECCORRIDA ");
 		sql.append("                   AND EE.TIPOEVENTOEXTRA_ID = 1 ) ");
-		sql.append("       WHERE CJ.PRECIOBASE>0 AND CJ.MOTIVOCANCELACION_ID IS NULL AND CJ.FECCORRIDA BETWEEN  :DATA_INICIO  AND   :DATA_FINAL    ");
+		sql.append("       LEFT JOIN TARIFA TF ");
-		sql.append("           AND TB1.RUTA_ID = C.RUTA_ID     ");
+		sql.append("              ON ( TF.CLASESERVICIO_ID = C.CLASESERVICIO_ID ");
-		sql.append("           AND TB2.CORRIDA_ID = C.CORRIDA_ID  ");
+		sql.append("                   AND TF.DESTINO_ID = C.DESTINO_ID ");
-		sql.append("           AND TB3.CORRIDA_ID = C.CORRIDA_ID  ");
+		sql.append("                   AND TF.ORIGEN_ID = C.ORIGEN_ID ");
-		sql.append("           AND TB4.CORRIDA_ID = C.CORRIDA_ID  ");
+		sql.append("                   AND TF.MARCA_ID = C.MARCA_ID ");
+		sql.append("                   AND TF.RUTA_ID = C.RUTA_ID ) ");
+		sql.append("       LEFT OUTER JOIN VIGENCIA_TARIFA VTF ");
+		sql.append("                    ON ( TF.VIGENCIATARIFA_ID = VTF.VIGENCIATARIFA_ID ");
+		sql.append("                         AND C.FECCORRIDA BETWEEN VTF.FECINICIOVIGENCIA AND ");
+		sql.append("                                                  VTF.FECFINVIGENCIA ) ");
+		sql.append(" WHERE  CJ.PRECIOBASE > 0 ");
+		sql.append("       AND CJ.MOTIVOCANCELACION_ID IS NULL ");
+		sql.append("       AND CJ.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL  ");
+		sql.append("       AND TB1.RUTA_ID = C.RUTA_ID ");
+		sql.append("       AND TB2.CORRIDA_ID = C.CORRIDA_ID ");
+		sql.append("       AND TB3.CORRIDA_ID = C.CORRIDA_ID ");
+		sql.append("       AND TB4.CORRIDA_ID = C.CORRIDA_ID ");
 
 		if (empresa != null) {
 			sql.append("   AND    C.EMPRESACORRIDA_ID IN (   " + empresa.getEmpresaId() + "   )     ");
@@ -512,31 +525,24 @@ public class RelatorioLinhasHorario extends Relatorio {
 		sql.append("       AND RO.ACTIVO = 1 ");
 		sql.append("       AND DA.ACTIVO = 1 ");
 		sql.append("       AND CS.ACTIVO = 1 ");
-
+		sql.append(" GROUP  BY R.RUTA_ID, ");
-		sql.append("   GROUP  BY   ");
+		sql.append("          NVL(GR.DESCGRUPO, 'NÃO POSSUI GRUPO'), ");
-		sql.append("          R.RUTA_ID, ");
+		sql.append("          TO_CHAR(C.FECHORSALIDA, 'HH24:MI'), ");
-		sql.append("          NVL(GR.DESCGRUPO, 'NÃO POSSUI GRUPO'),  ");
+		sql.append("          C.CORRIDA_ID, ");
-		sql.append("          TO_CHAR(CJ.FECHORVIAJE, 'HH24:MI'),  ");
+		sql.append("          R.INDSENTIDOIDA, ");
-		sql.append("          C.CORRIDA_ID,  ");
+		sql.append("          TF.PRECIOORIGINAL, ");
-		sql.append("          R.INDSENTIDOIDA,  ");
+		sql.append("          DA.CANTASIENTOS, ");
-		sql.append("          CJ.PRECIOBASE,  ");
+		sql.append("          CS.CVECLASE, ");
-		sql.append("          DA.CANTASIENTOS,  ");
+		sql.append("          EXTENSAO, ");
-		sql.append("          CS.CVECLASE,  ");
+		sql.append("          ORD, ");
-		sql.append("          CJ.NUMKMVIAJE,  ");
+		sql.append("          EXTRA, ");
-		sql.append("          EXTENSAO,  ");
+		sql.append("          ABSOL, ");
-		sql.append("       ORD, ");
+		sql.append("          CO.ESTADO_ID, ");
-		sql.append("       EXTRA, ");
+		sql.append("          CD.ESTADO_ID, ");
-
+		sql.append("          ORIGEM.CVEPARADA, ");
-		sql.append("       ABSOL, ");
+		sql.append("          DESTINO.CVEPARADA ");
-
+		sql.append(" ORDER  BY NVL(GR.DESCGRUPO, 'NÃO POSSUI GRUPO'), ");
-		sql.append("           CO.ESTADO_ID, ");
+		sql.append("          C.CORRIDA_ID ");
-		sql.append("           CD.ESTADO_ID, ");
-
-		sql.append("          ORIGEM.CVEPARADA,  ");
-		sql.append("          DESTINO.CVEPARADA   ");
-		sql.append("   ORDER BY  ");
-		sql.append("  NVL(GR.DESCGRUPO, 'NÃO POSSUI GRUPO'),  ");
-		sql.append("  C.CORRIDA_ID  ");
 
 		return sql.toString();
 

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLinhasHorario_pt_BR.properties

@@ -29,7 +29,7 @@ detail.tarifa=Tarifa
 detail.passagens=Passagens
 detail.seguro=Seguro
 detail.bagagens=Bagagens
-detail.segOpc=Seg.Opc.
+detail.segOpc=Tx. Embarque 
 detail.total=Total
 detail.ord=Ord.
 detail.extra=Extra
@@ -45,6 +45,7 @@ detail.rsViagem=R$/Viagem
 detail.paxOfer=Pax.Km Ofer.
 detail.paxTrans=Pax.Km Transportado
 detail.iap=IAP%
+detail.pedagio=Pedágio
 
 
 #Group

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioLinhasHorario" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="ae2cbb01-bc79-4d18-8206-3b59273fe793">
 	<property name="ireport.zoom" value="2.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="26"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="NOMBEMPRESA" class="java.lang.String"/>
 	<parameter name="DATA_INICIO" class="java.sql.Timestamp">
@@ -31,6 +31,7 @@
 	<parameter name="TOTAL_IAP" class="java.math.BigDecimal"/>
 	<parameter name="TOTAL_PAX_KM_TRANSPORTADO" class="java.math.BigDecimal"/>
 	<parameter name="DESCGRUPO" class="java.lang.String"/>
+	<parameter name="TOTAL_PEDAGIO" class="java.math.BigDecimal"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -65,6 +66,7 @@
 	<field name="seguro" class="java.math.BigDecimal"/>
 	<field name="iap" class="java.math.BigDecimal"/>
 	<field name="tipoLinha" class="java.lang.String"/>
+	<field name="pedagio" class="java.math.BigDecimal"/>
 	<variable name="passagens_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
 		<variableExpression><![CDATA[$F{passagens}]]></variableExpression>
 	</variable>
@@ -122,6 +124,9 @@
 	<variable name="iap_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
 		<variableExpression><![CDATA[$F{iap}]]></variableExpression>
 	</variable>
+	<variable name="pedagio_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" calculation="Sum">
+		<variableExpression><![CDATA[$F{pedagio}]]></variableExpression>
+	</variable>
 	<variable name="media_rsViagem_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta">
 		<variableExpression><![CDATA[$V{rsViagem_group}.divide( BigDecimal.valueOf($V{groupRuta_COUNT}.longValue()), RoundingMode.HALF_EVEN )]]></variableExpression>
 	</variable>
@@ -203,12 +208,15 @@
 	<variable name="linha_media_mpe_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha">
 		<variableExpression><![CDATA[$V{linha_mpe_group}.divide( BigDecimal.valueOf($V{groupTipoLinha_COUNT}.longValue()), RoundingMode.HALF_EVEN )]]></variableExpression>
 	</variable>
+	<variable name="linha_pedagio_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" incrementType="Group" incrementGroup="groupRuta" calculation="Sum">
+		<variableExpression><![CDATA[$V{pedagio_group}]]></variableExpression>
+	</variable>
 	<group name="groupTipoLinha">
 		<groupExpression><![CDATA[$F{tipoLinha}]]></groupExpression>
 		<groupHeader>
 			<band height="11">
 				<textField>
-					<reportElement uuid="ec272582-7d97-4f4f-b17f-6b2fc07cce24" x="0" y="0" width="32" height="10"/>
+					<reportElement uuid="ec272582-7d97-4f4f-b17f-6b2fc07cce24" x="0" y="0" width="22" height="10"/>
 					<textElement>
 						<font size="6"/>
 					</textElement>
@@ -218,7 +226,7 @@
 					<reportElement uuid="5d89bbb4-1324-4ab5-8779-340eecf810d9" x="0" y="10" width="802" height="1"/>
 				</line>
 				<textField isBlankWhenNull="true">
-					<reportElement uuid="e75e3f46-1173-42d0-9830-e40b067c2135" x="32" y="0" width="50" height="10"/>
+					<reportElement uuid="e75e3f46-1173-42d0-9830-e40b067c2135" x="22" y="0" width="47" height="10"/>
 					<textElement>
 						<font size="6"/>
 					</textElement>
@@ -239,28 +247,28 @@
 					<reportElement uuid="25517b93-4d63-44cc-b309-a8f40ab2e960" x="0" y="10" width="802" height="1"/>
 				</line>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="d5b91df5-2453-4baa-94f1-06a052273bc7" x="231" y="0" width="33" height="10"/>
+					<reportElement uuid="d5b91df5-2453-4baa-94f1-06a052273bc7" x="210" y="0" width="33" height="10"/>
-					<textElement>
+					<textElement textAlignment="Center">
 						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{linha_passagens_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="ed967165-58f3-4aa1-b532-4afbdccf91e4" x="264" y="0" width="24" height="10"/>
+					<reportElement uuid="ed967165-58f3-4aa1-b532-4afbdccf91e4" x="243" y="0" width="24" height="10"/>
 					<textElement>
 						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{linhas_seguro_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="515f260a-4446-478e-8d3e-8c704d8d3e0e" x="288" y="0" width="32" height="10"/>
+					<reportElement uuid="515f260a-4446-478e-8d3e-8c704d8d3e0e" x="267" y="0" width="32" height="10"/>
 					<textElement>
 						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{linha_bagagens_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="052ce233-407b-4537-ad6c-84ef263e1093" x="320" y="0" width="29" height="10"/>
+					<reportElement uuid="052ce233-407b-4537-ad6c-84ef263e1093" x="299" y="0" width="21" height="10"/>
 					<textElement>
 						<font size="6"/>
 					</textElement>
@@ -330,14 +338,14 @@
 					<textFieldExpression><![CDATA[$V{linha_paxKmOfertado_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="93820d28-161d-45ac-8f58-6606eba9ba9f" x="714" y="0" width="66" height="10"/>
+					<reportElement uuid="93820d28-161d-45ac-8f58-6606eba9ba9f" x="714" y="0" width="62" height="10"/>
 					<textElement textAlignment="Center">
 						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{linha_paxKmTransportad_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="c37204b8-1813-45e8-975a-09c9b6c2625f" x="780" y="0" width="22" height="10"/>
+					<reportElement uuid="c37204b8-1813-45e8-975a-09c9b6c2625f" x="776" y="0" width="26" height="10"/>
 					<textElement textAlignment="Center">
 						<font size="6"/>
 					</textElement>
@@ -371,6 +379,13 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$V{linha_media_mpe_group}]]></textFieldExpression>
 				</textField>
+				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
+					<reportElement uuid="672d6e14-25fb-4ac4-bfd0-a2448c73ecd1" x="320" y="0" width="29" height="10"/>
+					<textElement>
+						<font size="6"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{linha_pedagio_group}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupFooter>
 	</group>
@@ -379,7 +394,7 @@
 		<groupHeader>
 			<band height="11">
 				<textField isBlankWhenNull="true">
-					<reportElement uuid="f1171f5c-2175-4176-82b0-c1a31f78f1d3" x="0" y="0" width="100" height="10"/>
+					<reportElement uuid="f1171f5c-2175-4176-82b0-c1a31f78f1d3" x="0" y="0" width="69" height="10"/>
 					<textElement>
 						<font size="6"/>
 					</textElement>
@@ -403,28 +418,28 @@
 					<textFieldExpression><![CDATA[$R{group.total}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="2b63a56a-7ac3-4799-8e6e-5c2b7d8a3e8d" x="231" y="1" width="33" height="10"/>
+					<reportElement uuid="2b63a56a-7ac3-4799-8e6e-5c2b7d8a3e8d" x="210" y="1" width="33" height="10"/>
-					<textElement>
+					<textElement textAlignment="Center">
 						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{passagens_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="378f8813-35a0-41e8-8be0-dfa2d32fccd7" x="264" y="1" width="24" height="10"/>
+					<reportElement uuid="378f8813-35a0-41e8-8be0-dfa2d32fccd7" x="243" y="1" width="24" height="10"/>
 					<textElement>
 						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{seguro_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="0471f436-05eb-42c6-81d8-d1d621aa0f9b" x="288" y="1" width="32" height="10"/>
+					<reportElement uuid="0471f436-05eb-42c6-81d8-d1d621aa0f9b" x="267" y="1" width="32" height="10"/>
 					<textElement>
 						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{bagagens_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="1597d3ae-d93b-487e-8c6f-d04c7071b09e" x="320" y="1" width="29" height="10"/>
+					<reportElement uuid="1597d3ae-d93b-487e-8c6f-d04c7071b09e" x="299" y="1" width="21" height="10"/>
 					<textElement>
 						<font size="6"/>
 					</textElement>
@@ -494,14 +509,14 @@
 					<textFieldExpression><![CDATA[$V{paxKmOfertado_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="e05e5006-df09-4a56-8f1f-c28a115b7e7d" x="714" y="1" width="66" height="10"/>
+					<reportElement uuid="e05e5006-df09-4a56-8f1f-c28a115b7e7d" x="714" y="1" width="62" height="10"/>
 					<textElement textAlignment="Center">
 						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{paxKmTransportad_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="bbb7ad5a-6419-49bf-8384-bcc23430dadc" x="780" y="1" width="22" height="10"/>
+					<reportElement uuid="bbb7ad5a-6419-49bf-8384-bcc23430dadc" x="776" y="1" width="26" height="10"/>
 					<textElement textAlignment="Center">
 						<font size="6"/>
 					</textElement>
@@ -538,6 +553,13 @@
 				<line>
 					<reportElement uuid="736a47e0-7471-44d8-98df-c61d122bf3ac" x="0" y="11" width="802" height="1"/>
 				</line>
+				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
+					<reportElement uuid="097aeec9-e3cc-42ae-b38d-d47111080605" x="320" y="1" width="29" height="10"/>
+					<textElement>
+						<font size="6"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{pedagio_group}]]></textFieldExpression>
+				</textField>
 			</band>
 		</groupFooter>
 	</group>
@@ -592,7 +614,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement uuid="26156964-8733-4ad1-96fd-2ae8414636b7" x="780" y="20" width="23" height="20"/>
+				<reportElement uuid="26156964-8733-4ad1-96fd-2ae8414636b7" x="780" y="20" width="22" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
@@ -608,7 +630,7 @@
 				<reportElement uuid="48a39edc-ed2a-40cb-8bfb-6e97bcb9088a" x="0" y="81" width="803" height="1"/>
 			</line>
 			<textField>
-				<reportElement uuid="c11155fe-5b61-44d7-8ad6-f9a3181f6c0a" x="611" y="83" width="169" height="10"/>
+				<reportElement uuid="c11155fe-5b61-44d7-8ad6-f9a3181f6c0a" x="606" y="83" width="185" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
@@ -638,14 +660,14 @@
 				<reportElement uuid="5e64ae31-94b7-4b72-872c-d68ac8262db5" x="397" y="93" width="87" height="1"/>
 			</line>
 			<textField>
-				<reportElement uuid="b350299e-c005-4896-b5b3-2a20af2166ce" x="210" y="83" width="166" height="10"/>
+				<reportElement uuid="b350299e-c005-4896-b5b3-2a20af2166ce" x="193" y="83" width="183" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.receita}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="c4e021a7-182e-4edc-a927-b3fbba87f5cc" x="198" y="93" width="189" height="1"/>
+				<reportElement uuid="c4e021a7-182e-4edc-a927-b3fbba87f5cc" x="183" y="93" width="204" height="1"/>
 			</line>
 			<textField>
 				<reportElement uuid="c0f124b2-3691-4f49-9b86-69d76f249584" x="0" y="96" width="22" height="9"/>
@@ -662,70 +684,70 @@
 				<textFieldExpression><![CDATA[$R{detail.servico}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="824877eb-7028-4256-9503-7045d7eaee3c" x="53" y="96" width="49" height="9"/>
+				<reportElement uuid="824877eb-7028-4256-9503-7045d7eaee3c" x="53" y="96" width="37" height="9"/>
 				<textElement markup="none">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.trecho}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="30b30f3d-c4f3-40a2-825a-812ae5475414" x="102" y="96" width="24" height="9"/>
+				<reportElement uuid="30b30f3d-c4f3-40a2-825a-812ae5475414" x="90" y="96" width="24" height="9"/>
 				<textElement markup="none">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.setido}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b9d303b2-5ea9-4cf0-845b-142089ac8f4d" x="126" y="96" width="19" height="9"/>
+				<reportElement uuid="b9d303b2-5ea9-4cf0-845b-142089ac8f4d" x="114" y="96" width="15" height="9"/>
 				<textElement markup="none">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.lot}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="c5d483c4-89a2-4724-ad57-731676551f0f" x="145" y="96" width="13" height="9"/>
+				<reportElement uuid="c5d483c4-89a2-4724-ad57-731676551f0f" x="129" y="96" width="12" height="9"/>
 				<textElement markup="none">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.cal}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b4d0878e-61e8-436c-a83b-8f95548e52be" x="158" y="96" width="40" height="9"/>
+				<reportElement uuid="b4d0878e-61e8-436c-a83b-8f95548e52be" x="141" y="96" width="40" height="9"/>
-				<textElement markup="none">
+				<textElement textAlignment="Center" markup="none">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.extensao}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="bfa408a8-8c65-4c34-81fd-6dae64383682" x="198" y="96" width="33" height="9"/>
+				<reportElement uuid="bfa408a8-8c65-4c34-81fd-6dae64383682" x="183" y="96" width="27" height="9"/>
 				<textElement markup="none">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.tarifa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="7cf8f759-fbec-487c-af73-6d5d3c10137d" x="231" y="96" width="33" height="9"/>
+				<reportElement uuid="7cf8f759-fbec-487c-af73-6d5d3c10137d" x="210" y="96" width="33" height="9"/>
 				<textElement markup="none">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.passagens}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="08129899-1cb2-460b-b588-396c4fc9d3a9" x="264" y="96" width="24" height="9"/>
+				<reportElement uuid="08129899-1cb2-460b-b588-396c4fc9d3a9" x="243" y="96" width="24" height="9"/>
 				<textElement markup="none">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.seguro}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="45180c94-326c-471b-a91a-550660fa54ac" x="288" y="96" width="32" height="9"/>
+				<reportElement uuid="45180c94-326c-471b-a91a-550660fa54ac" x="267" y="96" width="32" height="9"/>
 				<textElement markup="none">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.bagagens}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="3b6488cb-b3e1-4586-b25b-6e2d59e707b7" x="320" y="96" width="29" height="9"/>
+				<reportElement uuid="3b6488cb-b3e1-4586-b25b-6e2d59e707b7" x="299" y="96" width="21" height="9"/>
 				<textElement markup="none">
 					<font size="6"/>
 				</textElement>
@@ -823,14 +845,14 @@
 				<textFieldExpression><![CDATA[$R{detail.paxOfer}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement uuid="1d3df7eb-9705-4f8e-b2fd-ecd5a4a7f80a" x="714" y="97" width="66" height="8"/>
+				<reportElement uuid="1d3df7eb-9705-4f8e-b2fd-ecd5a4a7f80a" x="714" y="97" width="62" height="8"/>
 				<textElement textAlignment="Left" verticalAlignment="Top">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.paxTrans}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement uuid="c8d3caa0-189a-4aba-a780-25dd9b76872f" x="780" y="97" width="22" height="8"/>
+				<reportElement uuid="c8d3caa0-189a-4aba-a780-25dd9b76872f" x="776" y="97" width="26" height="8"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
@@ -839,6 +861,13 @@
 			<line>
 				<reportElement uuid="b6bdef50-f793-4c23-b188-505c0fb7bf18" x="0" y="105" width="803" height="1"/>
 			</line>
+			<textField>
+				<reportElement uuid="e8a85150-8544-4698-83c9-35cdbd9f3f2b" x="320" y="96" width="29" height="9"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{detail.pedagio}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageHeader>
 	<columnHeader>
@@ -847,7 +876,7 @@
 	<detail>
 		<band height="10" splitType="Stretch">
 			<textField>
-				<reportElement uuid="9e1bc992-c77b-4217-9327-21e33680dcee" x="145" y="0" width="13" height="10"/>
+				<reportElement uuid="9e1bc992-c77b-4217-9327-21e33680dcee" x="129" y="0" width="12" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
@@ -868,21 +897,21 @@
 				<textFieldExpression><![CDATA[$F{extra}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00">
-				<reportElement uuid="16ac49df-dd15-4990-9a60-9ef4e0743d8f" x="264" y="0" width="24" height="10"/>
+				<reportElement uuid="16ac49df-dd15-4990-9a60-9ef4e0743d8f" x="243" y="0" width="24" height="10"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00">
-				<reportElement uuid="c491890a-4750-4cc3-8475-2c4fe508328c" x="780" y="0" width="22" height="10"/>
+				<reportElement uuid="c491890a-4750-4cc3-8475-2c4fe508328c" x="776" y="0" width="26" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{iap}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00">
-				<reportElement uuid="a1a23dd1-bd8b-42e1-b63b-4d4408b85510" x="714" y="0" width="66" height="10"/>
+				<reportElement uuid="a1a23dd1-bd8b-42e1-b63b-4d4408b85510" x="714" y="0" width="62" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
@@ -937,15 +966,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{kmRodado}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00;-#,##0.00">
-				<reportElement uuid="c5ede2ad-ab52-4a3a-b045-1a3c166c386f" x="288" y="0" width="32" height="10"/>
-				<textElement>
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{bagagens}]]></textFieldExpression>
-			</textField>
 			<textField>
-				<reportElement uuid="d5b5f4cf-5f24-4f8c-8a81-b86bc0420d08" x="102" y="0" width="24" height="10"/>
+				<reportElement uuid="d5b5f4cf-5f24-4f8c-8a81-b86bc0420d08" x="90" y="0" width="24" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
@@ -965,20 +987,6 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{hora}]]></textFieldExpression>
 			</textField>
-			<textField pattern="#,##0.00;-#,##0.00">
-				<reportElement uuid="aa9ec7a5-75b7-41b5-9d7b-fc2365eab048" x="198" y="0" width="33" height="10"/>
-				<textElement>
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="31b27b6f-543a-4cf7-bb38-400f0da64731" x="126" y="0" width="19" height="10"/>
-				<textElement>
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{lot}]]></textFieldExpression>
-			</textField>
 			<textField>
 				<reportElement uuid="f713249b-8c6e-43fa-a6ed-5a74d943740f" x="22" y="0" width="31" height="10"/>
 				<textElement textAlignment="Left">
@@ -1001,14 +1009,14 @@
 				<textFieldExpression><![CDATA[$F{absol}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00">
-				<reportElement uuid="34173f78-c597-498a-9277-929b9458ec25" x="231" y="0" width="33" height="10"/>
+				<reportElement uuid="34173f78-c597-498a-9277-929b9458ec25" x="210" y="0" width="33" height="10"/>
-				<textElement>
+				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{passagens}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00">
-				<reportElement uuid="a1e4e6af-8710-4df8-9f2d-c8e93d5b1ed4" x="320" y="0" width="29" height="10"/>
+				<reportElement uuid="a1e4e6af-8710-4df8-9f2d-c8e93d5b1ed4" x="299" y="0" width="21" height="10"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
@@ -1022,14 +1030,42 @@
 				<textFieldExpression><![CDATA[$F{ord}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="42a3d264-d1ba-4b69-81d4-6e6ae5f874c0" x="53" y="0" width="49" height="10"/>
+				<reportElement uuid="42a3d264-d1ba-4b69-81d4-6e6ae5f874c0" x="53" y="0" width="37" height="10"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{trecho}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="31b27b6f-543a-4cf7-bb38-400f0da64731" x="114" y="0" width="15" height="10"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{lot}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00;-#,##0.00">
+				<reportElement uuid="aa9ec7a5-75b7-41b5-9d7b-fc2365eab048" x="183" y="0" width="27" height="10"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
+			</textField>
 			<textField pattern="#,##0.00;-#,##0.00">
-				<reportElement uuid="afdc1c7a-72f8-4992-b747-97e4744034a1" x="158" y="0" width="40" height="10"/>
+				<reportElement uuid="c5ede2ad-ab52-4a3a-b045-1a3c166c386f" x="267" y="0" width="32" height="10"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{bagagens}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00;-#,##0.00">
+				<reportElement uuid="97d63f6f-b14b-418a-9837-9d0122a69b7c" x="320" y="0" width="29" height="10"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#,##0.00;-#,##0.00">
+				<reportElement uuid="afdc1c7a-72f8-4992-b747-97e4744034a1" x="141" y="0" width="40" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
@@ -1049,28 +1085,28 @@
 	<summary>
 		<band height="10" splitType="Stretch">
 			<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="fb2fa43e-b87b-4b4d-9e15-dd60bfe81787" positionType="Float" x="231" y="0" width="33" height="10"/>
+				<reportElement uuid="fb2fa43e-b87b-4b4d-9e15-dd60bfe81787" positionType="Float" x="210" y="0" width="33" height="10"/>
-				<textElement>
+				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{TOTAL_PASSAGENS}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="c0753597-89c3-40b9-a34a-ab382741214a" positionType="Float" x="264" y="0" width="24" height="10"/>
+				<reportElement uuid="c0753597-89c3-40b9-a34a-ab382741214a" positionType="Float" x="243" y="0" width="24" height="10"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{TOTAL_SEGURO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="8bc21d8a-7402-419f-91dc-73fd55f9054e" positionType="Float" x="288" y="0" width="32" height="10"/>
+				<reportElement uuid="8bc21d8a-7402-419f-91dc-73fd55f9054e" positionType="Float" x="267" y="0" width="32" height="10"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{TOTAL_BAGAGENS}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="c7443b9a-b8a7-4e0d-9771-a69c7cc56f14" positionType="Float" x="320" y="0" width="29" height="10"/>
+				<reportElement uuid="c7443b9a-b8a7-4e0d-9771-a69c7cc56f14" positionType="Float" x="299" y="0" width="21" height="10"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
@@ -1168,14 +1204,14 @@
 				<textFieldExpression><![CDATA[$P{TOTAL_PAX_KM_OFERTADO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="9098e4b0-55e4-44ea-8d26-05a85a1b9774" positionType="Float" x="714" y="0" width="66" height="10"/>
+				<reportElement uuid="9098e4b0-55e4-44ea-8d26-05a85a1b9774" positionType="Float" x="714" y="0" width="62" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{TOTAL_PAX_KM_TRANSPORTADO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="5c8e07f3-9ed9-40c0-a55d-a9a7dadb9dd6" positionType="Float" x="780" y="0" width="22" height="10"/>
+				<reportElement uuid="5c8e07f3-9ed9-40c0-a55d-a9a7dadb9dd6" positionType="Float" x="776" y="0" width="26" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
@@ -1188,6 +1224,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{total.geral}]]></textFieldExpression>
 			</textField>
+			<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="f6c3da32-fb1d-4b3c-8066-1680a898dc2d" x="320" y="0" width="29" height="10"/>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{TOTAL_PEDAGIO}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>

src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java

@@ -14,7 +14,6 @@ public class RelatorioLinhasHorarioBean {
 	private String sentido;
 	private BigDecimal lot;
 	private String cla;
-	private BigDecimal extensaoTrecho;
 	private BigDecimal extensao;
 	private BigDecimal tarifa;
 	private BigDecimal passagens;
@@ -37,7 +36,10 @@ public class RelatorioLinhasHorarioBean {
 	private BigDecimal paxKmOfertado;
 	private BigDecimal paxKmTransportado;
 	private BigDecimal iap;
-	private BigDecimal antiAbsol;
+	private BigDecimal txEmbarque;
+	private BigDecimal pedagio;
+	private BigDecimal ordLinha;
+	private BigDecimal extraLinha;
 
 	public RelatorioLinhasHorarioBean() {
 	}
@@ -136,14 +138,6 @@ public class RelatorioLinhasHorarioBean {
 		this.cla = cla;
 	}
 
-	public BigDecimal getExtensaoTrecho() {
-		return extensaoTrecho == null ? BigDecimal.ZERO : extensaoTrecho;
-	}
-
-	public void setExtensaoTrecho(BigDecimal extensaoTrecho) {
-		this.extensaoTrecho = extensaoTrecho;
-	}
-
 	public BigDecimal getExtensao() {
 		return extensao == null ? BigDecimal.ZERO : extensao;
 	}
@@ -320,12 +314,35 @@ public class RelatorioLinhasHorarioBean {
 		this.iap = iap;
 	}
 
-	public BigDecimal getAntiAbsol() {
+	public BigDecimal getTxEmbarque() {
-		return antiAbsol;
+		return txEmbarque;
 	}
 
-	public void setAntiAbsol(BigDecimal antiAbsol) {
+	public void setTxEmbarque(BigDecimal txEmbarque) {
-		this.antiAbsol = antiAbsol;
+		this.txEmbarque = txEmbarque;
 	}
 
+	public BigDecimal getPedagio() {
+		return pedagio;
+	}
+
+	public void setPedagio(BigDecimal pedagio) {
+		this.pedagio = pedagio;
+	}
+
+	public BigDecimal getOrdLinha() {
+		return ordLinha;
+	}
+
+	public void setOrdLinha(BigDecimal ordLinha) {
+		this.ordLinha = ordLinha;
+	}
+
+	public BigDecimal getExtraLinha() {
+		return extraLinha;
+	}
+
+	public void setExtraLinha(BigDecimal extraLinha) {
+		this.extraLinha = extraLinha;
+	}
 }

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java

@@ -35,13 +35,12 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.CorridaService;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
 import com.rjconsultores.ventaboletos.service.GrupoRutaService;
+import com.rjconsultores.ventaboletos.service.RutaService;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
-import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject;
 import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCorridaOrigemDestino;
 import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioLinhaHorario;
-import com.trg.search.Filter;
 
 @Controller("relatorioLinhasHorarioController")
 @Scope("prototype")
@@ -59,6 +58,9 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
 	@Autowired
 	private CorridaService corridaService;
 
+	@Autowired
+	private RutaService rutaService;
+
 	@Autowired
 	private GrupoRutaService grupoRutaService;
 
@@ -75,7 +77,6 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
 	private transient PagedListWrapper<Ruta> plwLinha;
 	private MyListbox linhaList;
 	private MyListbox linhaListSelList;
-	private Paging pagingLinha;
 	private Textbox txtPalavraPesquisaLinha;
 
 	private ArrayList<Ruta> lsNumLinha = new ArrayList<Ruta>();
@@ -162,7 +163,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
 			log.debug(e.getMessage());
 		}
 		parametros.put("GRUPORUTA", grupoRuta);
-		
+
 		if (grupoRuta != null) {
 			parametros.put("DESCGRUPO", grupoRuta.getDescGrupo());
 		} else {
@@ -216,14 +217,9 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
 	}
 
 	private void executarPesquisaLinha() {
-		HibernateSearchObject<Ruta> linhaBusqueda =
-				new HibernateSearchObject<Ruta>(Ruta.class, pagingLinha.getPageSize());
 
-		linhaBusqueda.addFilterOr(Filter.like("descruta", "%" + txtPalavraPesquisaLinha.getText().trim().toUpperCase().concat("%")), Filter.like("prefixo", "%" + txtPalavraPesquisaLinha.getText().trim().toUpperCase().concat("%")));
+		String palavraPesquisaRuta = txtPalavraPesquisaLinha.getText();
-		linhaBusqueda.addSortAsc("descruta");
+		linhaList.setData(rutaService.buscaRuta(palavraPesquisaRuta));
-		linhaBusqueda.addFilterEqual("activo", Boolean.TRUE);
-
-		plwLinha.init(linhaBusqueda, linhaList, pagingLinha);
 
 		if (linhaList.getData().length == 0) {
 			try {
@@ -238,7 +234,6 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer {
 	private void executarPesquisaServico() {
 
 		Integer corridaId = txtCorridaId.getValue();
-
 		servicoList.setData(corridaService.buscarGroupCorrridaId(corridaId, datInicial.getValue(), datFinal.getValue()));
 
 		if (servicoList.getData().length == 0) {

src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioLinhaHorario.java

@@ -15,7 +15,10 @@ public class RenderRelatorioLinhaHorario implements ListitemRenderer {
 	public void render(Listitem lstm, Object o) throws Exception {
 		Ruta ruta = (Ruta) o;
 
-		Listcell lc = new Listcell(ruta.getPrefixo());
+		Listcell lc = new Listcell(ruta.getNumRuta().toString());
+		lc.setParent(lstm);
+
+		lc = new Listcell(ruta.getPrefixo());
 		lc.setParent(lstm);
 
 		lc = new Listcell(ruta.getDescruta());

web/WEB-INF/i3-label_pt_BR.label

@@ -300,7 +300,10 @@ relatorioLinhasHorarioController.lbGrupoRuta.label = Grupo de Linhas
 relatorioLinhasHorarioController.lbLote.label = Lote
 relatorioLinhasHorarioController.lbLinha.label = Linha
 relatorioLinhasHorarioController.lbServico.label = Servico
+
+relatorioLinhasHorarioController.lbNumRuta.label = Num. Linha
 relatorioLinhasHorarioController.lbPrefixo.label = Prefixo
+
 relatorioLinhasHorarioController.lbOrgao.label = Orgão Concedente
 relatorioLinhasHorarioController.lbDataCorrida.value = Data
 relatorioLinhasHorarioController.btnPesquisa.label = Pesquisar

web/gui/relatorios/filtroRelatorioLinhasHorario.zul

@@ -135,14 +135,18 @@
 									vflex="true" multiple="false" height="60%" width="410px">
 									<listhead>
 
+										<listheader
+											label="${c:l('relatorioLinhasHorarioController.lbNumRuta.label')}"
+											width="18%" />
+
 										<listheader
 											label="${c:l('relatorioLinhasHorarioController.lbPrefixo.label')}"
 											width="20%" />
 										<listheader
-											label="${c:l('lb.dec')}" width="50%" />
+											label="${c:l('lb.dec')}" width="35%" />
 										<listheader
 											label="${c:l('relatorioLinhasHorarioController.lbOrgao.label')}"
-											width="30%" />
+											width="27%" />
 									</listhead>
 								</listbox>
 								<paging id="pagingLinha" pageSize="10" />
@@ -161,14 +165,17 @@
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
 									vflex="true" multiple="true" height="60%" width="100%">
 									<listhead>
+										<listheader
+											label="${c:l('relatorioLinhasHorarioController.lbNumRuta.label')}"
+											width="18%" />
 										<listheader
 											label="${c:l('relatorioLinhasHorarioController.lbPrefixo.label')}"
 											width="20%" />
 										<listheader
-											label="${c:l('lb.dec')}" width="45%" />
+											label="${c:l('lb.dec')}" width="30%" />
 										<listheader
 											label="${c:l('relatorioLinhasHorarioController.lbOrgao.label')}"
-											width="25%" />
+											width="22%" />
 										<listheader width="10%" />
 									</listhead>
 								</listbox>