fixes bug #10104

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

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

@@ -77,22 +77,33 @@ public class RelatorioSegundaVia extends Relatorio {
 
 			private RelatorioSegundaViaBean criarRelatorioSegundaViaBean(ResultSet rset) throws SQLException {
 				RelatorioSegundaViaBean r = new RelatorioSegundaViaBean();
+				
 				r.setBilheteiro(rset.getString("bilheteiro"));
 				r.setBilhete(rset.getInt("bilhete"));
-				r.setCoo(rset.getInt("coo") == 0 ? null : rset.getInt("coo"));
 				r.setDataVenda(rset.getTimestamp("dataVenda"));
 				r.setDataViagem(rset.getDate("dataViagem"));
-				r.setDestino(rset.getInt("destino"));
-				r.setOrigem(rset.getInt("origem"));
+				r.setDataServico(rset.getDate("dataServico"));
+				r.setDataSegundaVia(rset.getDate("dataSegundaVia"));
+				r.setDestino(rset.getString("destino"));
+				r.setOrigem(rset.getString("origem"));
+				r.setDescDestino(rset.getString("descDestino"));
+				r.setDescOrigem(rset.getString("descOrigem"));
 				r.setPedagio(rset.getBigDecimal("pedagio"));
-				r.setPoltrona(rset.getInt("poltrona"));
-				r.setPreImpresso(rset.getString("preImpresso"));
-				r.setPuntoVenta(rset.getInt("puntoVenta"));
+				r.setPoltrona(rset.getString("poltrona"));
 				r.setSeguro(rset.getBigDecimal("seguro"));
-				r.setSerieImpFiscal(rset.getString("serieImpFiscal"));
+				r.setSerieImpFiscal(rset.getString("serieImpFiscal")); 
+				r.setSerieImpFiscalSegundaVia(rset.getString("serieImpFiscalSegundaVia")); 
 				r.setServico(rset.getString("servico"));
 				r.setTaxa(rset.getBigDecimal("taxa"));
 				r.setTarifa(rset.getBigDecimal("tarifa"));
+				r.setNomeEmpresa(rset.getString("nomeEmpresa"));
+				r.setNomeAgencia(rset.getString("nomeAgencia"));
+				r.setLinha(rset.getString("linha")); 
+				r.setCcf(rset.getString("ccf"));
+				r.setTpp(rset.getBigDecimal("tpp"));
+				r.setSiglaTipoPassagem(rset.getString("siglaTipoPassagem"));
+				r.setTipoPassagem(rset.getString("tipoPassagem")); 
+				r.setValorTotal(rset.getBigDecimal("valortotal"));
 				return r;
 			}
 		});
@@ -105,39 +116,56 @@ public class RelatorioSegundaVia extends Relatorio {
 
 	private String getSqlDados(Date dataInicial, Date dataFinal, Integer empresaId, Integer puntoVentaId) {
 		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT boleto.CORRIDA_ID AS servico, ");
-		sql.append("boleto.FECHORVIAJE AS dataViagem, ");
-		sql.append("boleto.ORIGEN_ID AS origem, ");
-		sql.append("boleto.DESTINO_ID AS destino, ");
-		sql.append("boleto.NUMASIENTO AS poltrona, ");
-		sql.append("boleto.FECHORVENTA AS dataVenda, ");
-		sql.append("boleto.NUMFOLIOSISTEMA AS bilhete, ");
-		sql.append("usuario.NOMBUSUARIO AS bilheteiro, ");
-		sql.append("boleto.PUNTOVENTA_ID AS puntoVenta, ");
-		sql.append("boleto.PRECIOPAGADO AS tarifa, ");
-		sql.append("boleto.IMPORTETAXAEMBARQUE AS taxa, ");
-		sql.append("boleto.IMPORTESEGURO AS seguro, ");
-		sql.append("boleto.IMPORTEPEDAGIO AS pedagio, ");
-		sql.append("r4.COO AS coo, ");
-		sql.append("boleto.NUMFOLIOPREIMPRESO AS preimpresso, ");
-		sql.append("boleto.NUMSERIEPREIMPRESA AS seriePreImpresso, ");
-		sql.append("boleto.SERIEIMPFISCAL AS serieImpFiscal ");
-
-		sql.append("FROM BOLETO boleto ");
-		sql.append("INNER JOIN USUARIO usuario ON boleto.USUARIO_ID = usuario.USUARIO_ID ");
-		sql.append("inner join fiscal_impressora fi on fi.numserie = boleto.SERIEIMPFISCALORIGINAL  ");
-		sql.append("inner join fiscal_r4 r4 on r4.NUMSERIE20 = fi.NUMSERIE20 and r4.CONTADOR = boleto.CCF ");
-		sql.append("WHERE boleto.INDSEGUNDAVIAIMPRESSA = 1 ");
+		sql.append("select ");
+		sql.append("e.nombempresa as nomeEmpresa, ");
+		sql.append("pt.nombpuntoventa as nomeAgencia, ");
+		sql.append("usuario.nombusuario as bilheteiro, ");
+		sql.append("case when c.motivoreimpresion_id = 99 then b.fecsegundavia else null end as dataSegundaVia,");
+		sql.append("c.fechorventa as dataVenda, ");
+		sql.append("c.feccorrida as  dataServico,");
+		sql.append("c.fechorviaje as dataViagem, ");
+		sql.append("c.corrida_id as servico, ");
+		sql.append("r.descruta as linha, ");
+		sql.append("po.cveparada as origem, ");
+		sql.append("pd.cveparada as destino,");
+		sql.append("po.descparada as descOrigem, ");
+		sql.append("pd.descparada as descDestino, ");
+		sql.append("c.numasiento as poltrona, ");
+		sql.append("c.serieimpfiscal as serieImpFiscal, ");
+		sql.append("c.numfoliosistema as bilhete, ");
+		sql.append("c.ccf,");
+		sql.append("b.serieimpfiscal as serieImpFiscalSegundaVia, ");
+		sql.append("ca.cvecategoria as siglaTipoPassagem,");
+		sql.append("ca.desccategoria as tipoPassagem,");
+		sql.append("(select sum(cfpv.importe) from caja_formapago cfpv where cfpv.caja_id = c.caja_id and cfpv.activo = 1) as valortotal,");
+		sql.append("c.preciopagado as tarifa, ");
+		sql.append("c.importeseguro as seguro, ");
+		sql.append("c.importepedagio as pedagio, ");
+		sql.append("c.importetaxaembarque as taxa, ");
+		sql.append("c.importetpp as tpp ");
+		sql.append("from caja c ");
+		sql.append("inner join boleto b on (c.transacao_id = b.boleto_id)");
+		sql.append("inner join usuario usuario on c.usuario_id = usuario.usuario_id ");
+		sql.append("left join fiscal_impressora fi on fi.numserie = c.serieimpfiscaloriginal  ");
+		sql.append("left join fiscal_r4 r4 on r4.numserie20 = fi.numserie20 and r4.contador = c.ccf ");
+		sql.append("inner join empresa e on e.empresa_id = c.empresacorrida_id ");
+		sql.append("inner join categoria ca on c.categoria_id = ca.categoria_id ");
+		sql.append("inner join ruta r on r.ruta_id = c.ruta_id ");
+		sql.append("inner join parada po on po.parada_id = c.origen_id ");
+		sql.append("inner join parada pd on pd.parada_id = c.destino_id ");
+		sql.append("inner join punto_venta pt on pt.puntoventa_id = c.puntoventa_id ");
+		
+		sql.append("where b.indsegundaviaimpressa = 1 ");
 		if (dataInicial != null && dataFinal != null) {
-			sql.append(" AND boleto.FECSEGUNDAVIA BETWEEN :dataInicial AND :dataFinal");
+			sql.append(" and b.fecsegundavia between :dataInicial and :dataFinal");
 		}
 		if (empresaId != null && empresaId != -1) {
-			sql.append(" AND boleto.EMPRESACORRIDA_ID = " + empresaId);
+			sql.append(" and c.empresacorrida_id = " + empresaId);
 		}
 		if (puntoVentaId != null && puntoVentaId != -1) {
-			sql.append(" AND boleto.PUNTOVENTA_ID = " + puntoVentaId);
+			sql.append(" and c.puntoventa_id = " + puntoVentaId);
 		}
-
+		sql.append(" order by c.numfoliosistema, c.caja_id " );
 		return sql.toString();
 	}
 

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

@@ -1,22 +1,56 @@
-cabecalho.nome=Relatório Segunda Via
-cabecalho.periodo=Período
-cabecalho.periodoA=à
-cabecalho.puntoVenta=Agência:
-cabecalho.empresa=Empresa:
-label.servico=Serviço
-label.dataViagem=Data Viagem
-label.origem=Origem
-label.destino=Destino
-label.poltrona=Poltrona
-label.dataVenda=Data Venda
-label.bilheteiro=Bilheteiro
-label.bilhete=Bilhete
-label.puntoVenta=Agência
-label.tarifa=Tarifa
-label.taxa=Taxa
-label.seguro=Seguro
-label.pedagio=Pedágio
-label.coo=Coo
-label.preImpresso=Pre Imp.
-label.serieImpFiscal=Série
-msg.noData=Não foi possivel obter dados com os parâmetros informados.
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+msg.a=à
+
+#Labels header
+header.periodo=Período: 
+header.data.hora=Data/Hora\: 
+header.pagina=Página\: 
+header.filtro=Filtro\: 
+header.filtro.servico=Serviço\: 
+header.filtro.linha=Linha\: 
+header.filtro.grupo=Grupo de Linhas\:
+header.empresa=Empresa\:
+header.periodo.viagem=Período Viagem
+header.periodo.venda=Período Venda
+
+#Labels detail
+
+detail.data=Data
+detail.dataServico=Data Servi.
+detail.origen=Origem
+detail.destino=Destino
+detail.km=Km
+detail.linha=Linha
+detail.servicio=Serviço
+detail.hora=Hora
+detail.tipobilhete=Tipo Venda
+detail.tipopassagem=Tipo Passagem
+detail.pasajero=Passageiro
+detail.documento=Doc
+detail.precio=Preço
+detail.desconto=Desc.(%)
+detail.valorCobrado=Vlr.Cobrado
+detail.tarifa=Tarifa
+detail.bilheteiro=Bilheteiro
+detail.agencia=Agência
+detail.dataMD=Data MD
+detail.empresa=Empresa
+detail.tipo=Tipo
+detail.tipoDoc=Tipo Doc.
+detail.tarifa=Tarifa
+detail.seguro=Seguro
+detail.utr=UTR
+detail.tpp=TPP
+detail.pedagio=Pedágio
+detail.rg=RG
+detail.status=Status
+detail.codOrigem=Cod. Origem
+detail.codDestino=Cod. Destino
+detail.total=Total 	
+detail.ccf=CCf
+
+linhas=Linhas
+
+detail.numfoliosistema=Bilhete
+detail.numasiento=Poltrona

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

@@ -5,6 +5,7 @@ cabecalho.puntoVenta=Ag
 cabecalho.empresa=Empresa:
 label.servico=Serviço
 label.dataViagem=Data Viagem
+label.dataSegundaVia=Data Segunda Via.
 label.origem=Origem
 label.destino=Destino
 label.codOrigem=Cod.Origem
@@ -29,6 +30,8 @@ label.horaTransacao=Hora Trans.
 label.linha=Linha
 label.ccf=ccf
 label.ecf=ecf
+label.utr=UTR
+label.tpp=TPP
 label.siglaTipoPassagem=Sigl.Tip.Pass
 label.tipoPassagem=Tp.Pass
 label.valorTotal=Vlr.Tot

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

@@ -1,6 +1,6 @@
 <?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="RelatorioSegundaVia" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="832" leftMargin="5" rightMargin="5" topMargin="20" bottomMargin="20" uuid="0a7b3817-e201-4a91-8edd-6102b120e19f">
-	<property name="ireport.zoom" value="1.5"/>
+<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="RelatorioSegundaVia" pageWidth="1080" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1070" leftMargin="5" rightMargin="5" topMargin="20" bottomMargin="20" uuid="0a7b3817-e201-4a91-8edd-6102b120e19f">
+	<property name="ireport.zoom" value="1.0245201830476078"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="title"/>
@@ -16,8 +16,8 @@
 	<field name="coo" class="java.lang.Integer"/>
 	<field name="dataVenda" class="java.util.Date"/>
 	<field name="dataViagem" class="java.util.Date"/>
-	<field name="destino" class="java.lang.Integer"/>
-	<field name="origem" class="java.lang.Integer"/>
+	<field name="destino" class="java.lang.String"/>
+	<field name="origem" class="java.lang.String"/>
 	<field name="pedagio" class="java.math.BigDecimal"/>
 	<field name="preImpresso" class="java.lang.String"/>
 	<field name="puntoVenta" class="java.lang.Integer"/>
@@ -25,289 +25,441 @@
 	<field name="serieImpFiscal" class="java.lang.String"/>
 	<field name="servico" class="java.lang.String"/>
 	<field name="taxa" class="java.math.BigDecimal"/>
-	<field name="poltrona" class="java.lang.Integer"/>
+	<field name="poltrona" class="java.lang.String"/>
 	<field name="tarifa" class="java.math.BigDecimal"/>
+	<field name="nomeEmpresa" class="java.lang.String"/>
+	<field name="nomeAgencia" class="java.lang.String"/>
+	<field name="dataServico" class="java.util.Date"/>
+	<field name="linha" class="java.lang.String"/>
+	<field name="descOrigem" class="java.lang.String"/>
+	<field name="descDestino" class="java.lang.String"/>
+	<field name="ccf" class="java.lang.String"/>
+	<field name="tipoPassagem" class="java.lang.String"/>
+	<field name="siglaTipoPassagem" class="java.lang.String"/>
+	<field name="ecf" class="java.lang.String"/>
+	<field name="valorTotal" class="java.math.BigDecimal"/>
+	<field name="dataSegundaVia" class="java.util.Date"/>
+	<field name="serieImpFiscalSegundaVia" class="java.lang.String"/>
+	<field name="utr" class="java.math.BigDecimal"/>
+	<field name="tpp" class="java.math.BigDecimal"/>
 	<title>
-		<band height="81" splitType="Stretch">
+		<band height="109" splitType="Stretch">
 			<textField>
-				<reportElement uuid="6d12efc3-f23b-431a-bfb1-9950e6bfe6fc" x="53" y="61" width="139" height="20"/>
-				<textElement/>
+				<reportElement x="53" y="61" width="127" height="20" uuid="6d12efc3-f23b-431a-bfb1-9950e6bfe6fc"/>
 				<textFieldExpression><![CDATA[$P{puntoVenta}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="7830e707-ce31-4907-8665-aa462d023a82" x="0" y="20" width="620" height="20"/>
+				<reportElement x="0" y="20" width="621" height="20" uuid="7830e707-ce31-4907-8665-aa462d023a82"/>
 				<textElement>
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{dataInicial} + " " + $R{cabecalho.periodoA} + " " + $P{dataFinal}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b148e230-ff82-488a-bcdd-5ceb2ea723e3" x="0" y="0" width="620" height="20"/>
+				<reportElement x="0" y="0" width="621" height="20" uuid="b148e230-ff82-488a-bcdd-5ceb2ea723e3"/>
 				<textElement markup="none">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm">
-				<reportElement uuid="1f9eb9ba-8865-4a88-9dbb-471a1907d3c5" x="638" y="0" width="164" height="20"/>
+				<reportElement x="621" y="0" width="209" height="20" uuid="1f9eb9ba-8865-4a88-9dbb-471a1907d3c5"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="47f0b61e-1ba4-43e4-9a4a-c8e17972b943" x="0" y="61" width="53" height="20"/>
-				<textElement/>
+				<reportElement x="0" y="61" width="53" height="20" uuid="47f0b61e-1ba4-43e4-9a4a-c8e17972b943"/>
 				<textFieldExpression><![CDATA[$R{cabecalho.puntoVenta}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f4c6e5b9-844d-440a-9a47-719101152087" x="0" y="41" width="53" height="20"/>
+				<reportElement x="0" y="41" width="53" height="20" uuid="f4c6e5b9-844d-440a-9a47-719101152087"/>
 				<textElement markup="none"/>
 				<textFieldExpression><![CDATA[$R{cabecalho.empresa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="6985a79c-5487-47e6-acf7-e94ef7c24073" x="53" y="41" width="139" height="20"/>
-				<textElement/>
+				<reportElement x="53" y="41" width="127" height="20" uuid="6985a79c-5487-47e6-acf7-e94ef7c24073"/>
 				<textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression>
 			</textField>
 		</band>
 	</title>
 	<columnHeader>
-		<band height="20" splitType="Stretch">
+		<band height="26">
 			<textField>
-				<reportElement uuid="3ed0e9b0-4cba-410c-b60a-75021ba8aaba" x="0" y="0" width="56" height="20"/>
+				<reportElement x="0" y="4" width="53" height="20" uuid="3ed0e9b0-4cba-410c-b60a-75021ba8aaba"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.servico}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.nomeEmpresa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="9dfd606c-5acb-4973-b55c-9ff16699cbae" x="56" y="0" width="56" height="20"/>
+				<reportElement x="498" y="4" width="27" height="20" uuid="fd9f277b-fe19-442c-8e90-80c6a3ec6a42"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.dataViagem}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.codOrigem}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="fd9f277b-fe19-442c-8e90-80c6a3ec6a42" x="112" y="0" width="49" height="20"/>
+				<reportElement x="589" y="4" width="32" height="20" uuid="215a6ac2-7b4a-4351-93a5-be690a63294b"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.codDestino}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="215a6ac2-7b4a-4351-93a5-be690a63294b" x="161" y="0" width="49" height="20"/>
+				<reportElement x="676" y="4" width="29" height="20" uuid="8e219835-55b3-44d4-924b-d3f90cbfe8bf"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="8e219835-55b3-44d4-924b-d3f90cbfe8bf" x="210" y="0" width="47" height="20"/>
-				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.poltrona}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="42b9ffff-b6c6-48b7-beb2-0e664de7f058" x="257" y="0" width="75" height="20"/>
+				<reportElement x="180" y="4" width="76" height="20" uuid="42b9ffff-b6c6-48b7-beb2-0e664de7f058"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.dataVenda}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.dataSegundaVia}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="6d81ffde-0d85-4b8c-8f3c-28a940854348" x="332" y="0" width="54" height="20"/>
+				<reportElement x="125" y="4" width="55" height="20" uuid="6d81ffde-0d85-4b8c-8f3c-28a940854348"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.bilheteiro}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="1ae18e81-d143-469b-9f83-d41bc75d47c9" x="386" y="0" width="45" height="20"/>
+				<reportElement x="742" y="4" width="29" height="20" uuid="1ae18e81-d143-469b-9f83-d41bc75d47c9"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.bilhete}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="a56cd406-c7e8-48de-8e5d-908cdce4f315" x="431" y="0" width="50" height="20"/>
+				<reportElement x="771" y="4" width="29" height="20" uuid="a56cd406-c7e8-48de-8e5d-908cdce4f315"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.puntoVenta}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.ccf}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="630970c1-f08a-4b2d-83f5-6c8882168fde" x="481" y="0" width="52" height="20"/>
+				<reportElement x="934" y="4" width="31" height="20" uuid="630970c1-f08a-4b2d-83f5-6c8882168fde"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.tarifa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="7ccda019-1706-438d-bbce-b40a5171707f" x="533" y="0" width="35" height="20"/>
+				<reportElement x="965" y="4" width="30" height="20" uuid="459b8152-b3af-40e5-9b14-22214dc92fcc"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{label.taxa}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="459b8152-b3af-40e5-9b14-22214dc92fcc" x="568" y="0" width="42" height="20"/>
-				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.seguro}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b7690ce2-0872-4780-bbaa-fdb3924c98ac" x="610" y="0" width="53" height="20"/>
+				<reportElement x="995" y="4" width="35" height="20" uuid="b7690ce2-0872-4780-bbaa-fdb3924c98ac"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.pedagio}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="712db7b3-b00e-44fb-a0ec-286cbc03bf1e" x="663" y="0" width="54" height="20"/>
+				<reportElement x="334" y="4" width="36" height="20" uuid="7a67037e-c0b2-4d3c-9c7c-d53bcde3bb87"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.coo}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.servico}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="67b620b9-3720-46a1-8690-9ff642f90989" x="717" y="0" width="50" height="20"/>
+				<reportElement x="53" y="4" width="72" height="20" uuid="20c30ade-bf6b-4b3a-a45b-fdf58088f6bb"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.preImpresso}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$R{label.nomeAgencia}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="3ab501dc-de6e-4534-ad27-0798a00582ab" x="767" y="0" width="65" height="20"/>
+				<reportElement x="256" y="4" width="28" height="20" uuid="10ede63f-de68-46d8-a409-0cbe6c2e3895"/>
 				<textElement markup="none">
-					<font size="8" isBold="false"/>
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.horaTransacao}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="284" y="4" width="50" height="20" uuid="ab8e6a28-3de3-4379-a896-affeef5dbffe"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.dataServico}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="370" y="4" width="83" height="20" uuid="d67d17f7-33ea-42ac-bbd9-4867b1b9f916"/>
+				<textElement textAlignment="Center" markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.linha}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="453" y="4" width="45" height="20" uuid="caa0ca78-1be0-4ef7-9483-50bbd814bd35"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.horaServico}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="525" y="4" width="64" height="20" uuid="ae547a08-2468-4009-8909-ce85f1532ca3"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="621" y="4" width="55" height="20" uuid="1e1db656-f354-4217-b098-7308a7a2bbf1"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="705" y="4" width="37" height="20" uuid="3ab501dc-de6e-4534-ad27-0798a00582ab"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{label.serieImpFiscal}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="800" y="4" width="30" height="20" uuid="362468fc-822c-4cc4-8a4c-b689cf990247"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.ecf}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="830" y="4" width="28" height="20" uuid="37624dd3-ce84-4236-8f81-4497d2abc214"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.siglaTipoPassagem}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="858" y="4" width="45" height="20" uuid="e1f88283-95e9-4ef6-a310-5e615569c13c"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.tipoPassagem}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="903" y="4" width="31" height="20" uuid="dddcee83-2058-4dc7-a66a-a3a2078f56e1"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.valorTotal}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="1030" y="4" width="21" height="20" uuid="435d9b67-900e-42f0-8f8c-ed8c1c59a2a1"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.utr}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="1051" y="4" width="19" height="20" uuid="4a234cca-1499-4684-ac9f-66f94a0e8790"/>
+				<textElement markup="none">
+					<font size="8" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.tpp}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="20" splitType="Stretch">
+		<band height="30" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="fa4ed1e8-85a8-44f8-8e0b-6dd8480e37e8" stretchType="RelativeToTallestObject" x="0" y="0" width="56" height="20"/>
+				<reportElement stretchType="RelativeToTallestObject" x="334" y="0" width="36" height="29" uuid="fa4ed1e8-85a8-44f8-8e0b-6dd8480e37e8"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="393d66f0-36ac-4111-a1cb-4c86c0ea3b39" stretchType="RelativeToTallestObject" x="56" y="0" width="56" height="20"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
-			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="583d984f-13ec-499f-ac31-8f6672a12336" stretchType="RelativeToTallestObject" x="112" y="0" width="49" height="20"/>
+				<reportElement stretchType="RelativeToTallestObject" x="498" y="0" width="27" height="29" uuid="583d984f-13ec-499f-ac31-8f6672a12336"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="37e4f928-6c97-4a04-a452-b19832779cd7" stretchType="RelativeToTallestObject" x="161" y="0" width="49" height="20"/>
+				<reportElement stretchType="RelativeToTallestObject" x="589" y="0" width="32" height="29" uuid="37e4f928-6c97-4a04-a452-b19832779cd7"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="5d77e9c4-4b6e-4030-992f-8dcddbe9ad9b" stretchType="RelativeToTallestObject" x="210" y="0" width="47" height="20"/>
-				<textElement>
+				<reportElement stretchType="RelativeToTallestObject" x="676" y="0" width="29" height="29" uuid="5d77e9c4-4b6e-4030-992f-8dcddbe9ad9b"/>
+				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{poltrona}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
-				<reportElement uuid="5f2d301c-5c9d-4f13-b25b-bc121e7a888a" stretchType="RelativeToTallestObject" x="257" y="0" width="75" height="20"/>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="180" y="0" width="76" height="29" uuid="5f2d301c-5c9d-4f13-b25b-bc121e7a888a"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{dataSegundaVia}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="bc37d096-eb4b-4fc7-a9d2-2c68c619ce5c" stretchType="RelativeToTallestObject" x="332" y="0" width="54" height="20"/>
+				<reportElement stretchType="RelativeToTallestObject" x="125" y="0" width="55" height="29" uuid="bc37d096-eb4b-4fc7-a9d2-2c68c619ce5c"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{bilheteiro}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="c7f146b9-18ea-43b2-90f9-c4535885c64b" stretchType="RelativeToTallestObject" x="386" y="0" width="45" height="20"/>
+				<reportElement stretchType="RelativeToTallestObject" x="742" y="0" width="29" height="29" uuid="c7f146b9-18ea-43b2-90f9-c4535885c64b"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{bilhete}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="5b133346-bb57-44f0-9a85-b63f0d60f02a" stretchType="RelativeToTallestObject" x="431" y="0" width="50" height="20"/>
+				<reportElement stretchType="RelativeToTallestObject" x="771" y="0" width="29" height="29" uuid="5b133346-bb57-44f0-9a85-b63f0d60f02a"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{puntoVenta}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{ccf}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="660caf7d-d229-48bb-be15-56107e2187df" stretchType="RelativeToTallestObject" x="481" y="0" width="52" height="20"/>
+				<reportElement stretchType="RelativeToTallestObject" x="934" y="0" width="31" height="29" uuid="660caf7d-d229-48bb-be15-56107e2187df"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="600c5e27-ea07-408f-bb4c-69f3692cbe87" stretchType="RelativeToTallestObject" x="533" y="0" width="35" height="20"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{taxa}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="9a20c316-fc88-45b8-9cba-8c5eac8778ef" stretchType="RelativeToTallestObject" x="568" y="0" width="42" height="20"/>
+				<reportElement stretchType="RelativeToTallestObject" x="965" y="0" width="30" height="29" uuid="9a20c316-fc88-45b8-9cba-8c5eac8778ef"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
-				<reportElement uuid="fe52b8c5-b00a-40a1-a0fc-80b222ebfbaf" stretchType="RelativeToTallestObject" x="610" y="0" width="53" height="20"/>
+				<reportElement stretchType="RelativeToTallestObject" x="995" y="0" width="35" height="29" uuid="fe52b8c5-b00a-40a1-a0fc-80b222ebfbaf"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="0ba9dcf2-a371-46c6-9ff1-665c3f3220c1" stretchType="RelativeToTallestObject" x="663" y="0" width="54" height="20"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{coo}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="469745c1-5c80-4521-b7db-ae84e0046fd2" stretchType="RelativeToTallestObject" x="717" y="0" width="50" height="20"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{preImpresso}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="6f65a0ff-bbce-4e7c-aea3-68795952590c" stretchType="RelativeToTallestObject" x="767" y="0" width="65" height="20"/>
+				<reportElement stretchType="RelativeToTallestObject" x="705" y="0" width="37" height="29" uuid="6f65a0ff-bbce-4e7c-aea3-68795952590c"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{serieImpFiscal}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="53" height="29" uuid="e3857cbb-d9b4-4e46-aebd-5998e1371fd5"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{nomeEmpresa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="53" y="0" width="72" height="29" uuid="497be5c7-0986-4ae6-911b-bec8d95c883c"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{nomeAgencia}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="HH.mm" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="256" y="0" width="28" height="29" uuid="c8dbf3c4-b98c-4c78-b38b-97a9b44906a2"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="284" y="0" width="50" height="29" uuid="6bc08e9d-d76f-443c-9598-c4945a1bc23a"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="370" y="0" width="83" height="29" uuid="3a133cad-d16b-48f7-96ac-23ae5b42f3a1"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="HH.mm" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="453" y="0" width="45" height="29" uuid="7b46a1fd-2441-4d7e-8a2d-0f89c01b7628"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="525" y="0" width="64" height="29" uuid="a7c27960-ee5f-495c-9f26-40895de057d0"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{descOrigem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="621" y="0" width="55" height="29" uuid="bb0ea97d-2a68-4fe3-84c0-68e14b742a70"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{descDestino}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="800" y="0" width="30" height="29" uuid="7f655bd0-a1d8-4cde-bdba-4968e3890487"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{serieImpFiscalSegundaVia}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="830" y="0" width="28" height="29" uuid="5dab28d4-b86c-4c1a-8028-b6ad383fde8c"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{siglaTipoPassagem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="858" y="0" width="45" height="29" uuid="a0cc8fb9-b649-4377-875f-175f2902a8de"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tipoPassagem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="903" y="0" width="31" height="29" uuid="703b36be-720b-4b8b-aaba-b04fded2c5d6"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valorTotal}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1030" y="0" width="21" height="29" uuid="d44399c6-3300-4041-9d93-afa476e744f5"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{utr}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="1051" y="0" width="19" height="29" uuid="098bb6bc-42f4-4767-862a-0b1c5711624d"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tpp}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<noData>
 		<band height="20">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="4236d52e-7d65-4f66-8db1-c717eff5de62" positionType="Float" x="0" y="0" width="555" height="20" isPrintWhenDetailOverflows="true"/>
+				<reportElement positionType="Float" x="0" y="0" width="1041" height="20" isPrintWhenDetailOverflows="true" uuid="4236d52e-7d65-4f66-8db1-c717eff5de62"/>
 				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
 			</textField>

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

@@ -7,10 +7,12 @@ public class RelatorioSegundaViaBean {
 
 	private String servico;
 	private Date dataViagem;
-	private Integer origem;
-	private Integer destino;
-	private Integer poltrona;
+	private Date dataServico;
+	private String origem;
+	private String destino;
+	private String poltrona;
 	private Date dataVenda;
+	private Date dataSegundaVia;
 	private String bilheteiro;
 	private Integer bilhete;
 	private Integer puntoVenta;
@@ -18,10 +20,23 @@ public class RelatorioSegundaViaBean {
 	private BigDecimal tarifa;
 	private BigDecimal seguro;
 	private BigDecimal pedagio;
+	private BigDecimal tpp;
+	private BigDecimal utr;
 	private Integer coo;
 	private String preImpresso;
 	private String seriePreImpresso;
 	private String serieImpFiscal;
+	private String serieImpFiscalSegundaVia;
+	private String nomeEmpresa;
+	private String nomeAgencia;
+	private String linha;
+	private String descOrigem;
+	private String descDestino;
+	private String ccf;
+	private String ecf;
+	private BigDecimal valorTotal;
+	private String siglaTipoPassagem;
+	private String tipoPassagem;
 
 	public String getServico() {
 		return servico;
@@ -39,27 +54,27 @@ public class RelatorioSegundaViaBean {
 		this.dataViagem = dataViagem;
 	}
 
-	public Integer getOrigem() {
+	public String getOrigem() {
 		return origem;
 	}
 
-	public void setOrigem(Integer origem) {
+	public void setOrigem(String origem) {
 		this.origem = origem;
 	}
 
-	public Integer getDestino() {
+	public String getDestino() {
 		return destino;
 	}
 
-	public void setDestino(Integer destino) {
+	public void setDestino(String destino) {
 		this.destino = destino;
 	}
 
-	public Integer getPoltrona() {
+	public String getPoltrona() {
 		return poltrona;
 	}
 
-	public void setPoltrona(Integer poltrona) {
+	public void setPoltrona(String poltrona) {
 		this.poltrona = poltrona;
 	}
 
@@ -159,4 +174,124 @@ public class RelatorioSegundaViaBean {
 		this.serieImpFiscal = serieImpFiscal;
 	}
 
+	public String getNomeEmpresa() {
+		return nomeEmpresa;
+	}
+
+	public void setNomeEmpresa(String nomeEmpresa) {
+		this.nomeEmpresa = nomeEmpresa;
+	}
+
+	public String getNomeAgencia() {
+		return nomeAgencia;
+	}
+
+	public void setNomeAgencia(String nomeAgencia) {
+		this.nomeAgencia = nomeAgencia;
+	}
+
+	public Date getDataServico() {
+		return dataServico;
+	}
+
+	public void setDataServico(Date dataServico) {
+		this.dataServico = dataServico;
+	}
+
+	public String getLinha() {
+		return linha;
+	}
+
+	public void setLinha(String linha) {
+		this.linha = linha;
+	}
+
+	public String getDescOrigem() {
+		return descOrigem;
+	}
+
+	public void setDescOrigem(String descOrigem) {
+		this.descOrigem = descOrigem;
+	}
+
+	public String getDescDestino() {
+		return descDestino;
+	}
+
+	public void setDescDestino(String descDestino) {
+		this.descDestino = descDestino;
+	}
+
+	public String getCcf() {
+		return ccf;
+	}
+
+	public void setCcf(String ccf) {
+		this.ccf = ccf;
+	}
+
+	public String getEcf() {
+		return ecf;
+	}
+
+	public void setEcf(String ecf) {
+		this.ecf = ecf;
+	}
+
+	public BigDecimal getValorTotal() {
+		return valorTotal;
+	}
+
+	public void setValorTotal(BigDecimal valorTotal) {
+		this.valorTotal = valorTotal;
+	}
+
+	public String getSiglaTipoPassagem() {
+		return siglaTipoPassagem;
+	}
+
+	public void setSiglaTipoPassagem(String siglaTipoPassagem) {
+		this.siglaTipoPassagem = siglaTipoPassagem;
+	}
+
+	public String getTipoPassagem() {
+		return tipoPassagem;
+	}
+
+	public void setTipoPassagem(String tipoPassagem) {
+		this.tipoPassagem = tipoPassagem;
+	}
+
+	public String getSerieImpFiscalSegundaVia() {
+		return serieImpFiscalSegundaVia;
+	}
+
+	public void setSerieImpFiscalSegundaVia(String serieImpFiscalSegundaVia) {
+		this.serieImpFiscalSegundaVia = serieImpFiscalSegundaVia;
+	}
+
+	public Date getDataSegundaVia() {
+		return dataSegundaVia;
+	}
+
+	public void setDataSegundaVia(Date dataSegundaVia) {
+		this.dataSegundaVia = dataSegundaVia;
+	}
+
+	public BigDecimal getTpp() {
+		return tpp;
+	}
+
+	public void setTpp(BigDecimal tpp) {
+		this.tpp = tpp;
+	}
+
+	public BigDecimal getUtr() {
+		return utr;
+	}
+
+	public void setUtr(BigDecimal utr) {
+		this.utr = utr;
+	}
+
 }