From ae83540bf93ace4e90aae606aa64ad03b259d7bb Mon Sep 17 00:00:00 2001
From: "alexandre.lima" <alexandre.lima@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 23 Feb 2018 14:39:35 +0000
Subject: [PATCH] Fixes Bug #10597 - Code review feito com o Valdevir

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79140 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioGratuidade.java  |   4 +-
 .../templates/RelatorioGratuidade.jasper      | Bin 59593 -> 59377 bytes
 .../templates/RelatorioGratuidade.jrxml       | 165 ++++++++++--------
 .../utilitarios/RelatorioGratuidadeBean.java  |   6 +-
 4 files changed, 94 insertions(+), 81 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java
index 835406823..1d625442c 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java
@@ -98,6 +98,8 @@ public class RelatorioGratuidade extends Relatorio {
 		
 				lsDadosRelatorio = new ArrayList<RelatorioGratuidadeBean>();
 				
+				SimpleDateFormat hora = new SimpleDateFormat("HH:mm");
+				
 				while (rset.next()) {
 					RelatorioGratuidadeBean gratuidadeBean = new RelatorioGratuidadeBean();
 					
@@ -109,7 +111,7 @@ public class RelatorioGratuidade extends Relatorio {
 					gratuidadeBean.setDesctipoventa(rset.getString("desctipoventa"));
 					gratuidadeBean.setDestino(rset.getString("destino"));
 					gratuidadeBean.setFeccreacion(rset.getDate("feccreacion"));
-					gratuidadeBean.setFechorviaje(rset.getDate("fechorviaje"));
+					gratuidadeBean.setFechorviaje(hora.format(rset.getTimestamp("fechorviaje")));
 					gratuidadeBean.setKm(rset.getInt("numkmviaje"));
 					gratuidadeBean.setLinha(rset.getString("descruta"));
 					gratuidadeBean.setNombpasajero(rset.getString("nombpasajero"));
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper
index 6f13231a85f7d4b49bad4eeea0c83415a72f67ba..d100b3b9911714af2622bce928bb5ccf346634ab 100644
GIT binary patch
delta 17441
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
E0EP4Qr~m)}

delta 17455
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
IzrHB>e~4W%fB*mh

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml
index 5d21755d7..8d4f5fecd 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml
@@ -68,267 +68,276 @@
 	<title>
 		<band height="144">
 			<textField>
-				<reportElement x="0" y="0" width="314" height="37" uuid="652312bd-292a-424d-a234-5f157e3699c6"/>
+				<reportElement uuid="652312bd-292a-424d-a234-5f157e3699c6" x="0" y="0" width="314" height="37"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="37" width="109" height="23" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/>
+				<reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="37" width="109" height="23"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.periodo.viagem}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="633" y="37" width="106" height="23" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/>
+				<reportElement uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60" x="633" y="37" width="106" height="23"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement x="811" y="37" width="30" height="23" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/>
+				<reportElement uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f" x="811" y="37" width="30" height="23"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="739" y="37" width="39" height="23" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/>
+				<reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="739" y="37" width="39" height="23"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="109" y="37" width="205" height="23" uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50"/>
+				<reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="109" y="37" width="205" height="23"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[( $P{fecInicioViagem} != null ? ($P{fecInicioViagem} + " à " + $P{fecFinalViagem}) : "" )]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm">
-				<reportElement x="739" y="0" width="102" height="37" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/>
+				<reportElement uuid="6f671365-868e-41a6-81ee-a308d1d91e1d" x="739" y="0" width="102" height="37"/>
 				<textElement textAlignment="Left"/>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="778" y="37" width="33" height="23" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/>
+				<reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="778" y="37" width="33" height="23"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="60" width="109" height="21" uuid="a79c03e0-bbe4-4b1c-8297-533a0d137b27"/>
+				<reportElement uuid="a79c03e0-bbe4-4b1c-8297-533a0d137b27" x="0" y="60" width="109" height="21"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.periodo.venda}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="109" y="60" width="205" height="21" uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335"/>
+				<reportElement uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335" x="109" y="60" width="205" height="21"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) : "" )]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="81" width="109" height="20" uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0"/>
+				<reportElement uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0" x="0" y="81" width="109" height="20"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="368" y="114" width="73" height="26" uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb"/>
+				<reportElement uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb" x="368" y="114" width="73" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="474" y="114" width="68" height="26" uuid="e18edb89-17f4-417e-8041-664f11245cbd"/>
+				<reportElement uuid="e18edb89-17f4-417e-8041-664f11245cbd" x="474" y="114" width="68" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="257" y="114" width="57" height="26" uuid="67851ba5-cc9c-4f37-8857-9e3c5be9b362"/>
+				<reportElement uuid="67851ba5-cc9c-4f37-8857-9e3c5be9b362" x="257" y="114" width="57" height="26"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="224" y="114" width="33" height="26" uuid="93fedb4f-18e2-4d95-82e8-2108d3eb135c"/>
+				<reportElement uuid="93fedb4f-18e2-4d95-82e8-2108d3eb135c" x="224" y="114" width="33" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.servicio}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="314" y="114" width="28" height="26" uuid="3de0b54a-0b10-4556-9b0a-ba8f19989716"/>
+				<reportElement uuid="3de0b54a-0b10-4556-9b0a-ba8f19989716" x="314" y="114" width="28" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="739" y="114" width="39" height="26" uuid="cc834009-ae90-46d4-8bbb-37578b69f621"/>
+				<reportElement uuid="cc834009-ae90-46d4-8bbb-37578b69f621" x="739" y="114" width="39" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.tipobilhete}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="633" y="114" width="44" height="26" uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb"/>
+				<reportElement uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb" x="633" y="114" width="44" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.pasajero}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="707" y="114" width="32" height="26" uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af"/>
+				<reportElement uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af" x="707" y="114" width="32" height="26"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.documento}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="841" y="114" width="28" height="26" uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333"/>
+				<reportElement uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333" x="841" y="114" width="28" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.precio}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="869" y="114" width="40" height="26" uuid="e14732be-42a0-4f54-9eb2-52f10ece154b"/>
+				<reportElement uuid="e14732be-42a0-4f54-9eb2-52f10ece154b" x="869" y="114" width="40" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.desconto}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="909" y="114" width="41" height="26" uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3"/>
+				<reportElement uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3" x="909" y="114" width="41" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.valorCobrado}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="109" y="114" width="30" height="26" uuid="bb3d2388-6bda-4727-ba30-0a5f4612f1a8"/>
+				<reportElement uuid="bb3d2388-6bda-4727-ba30-0a5f4612f1a8" x="109" y="114" width="30" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.bilheteiro}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="778" y="114" width="33" height="26" uuid="6b1fac8d-c098-4893-b1dd-7b64573f0173"/>
+				<reportElement uuid="6b1fac8d-c098-4893-b1dd-7b64573f0173" x="778" y="114" width="33" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.tipopassagem}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="542" y="114" width="34" height="26" uuid="0948a2fc-fc39-4f2d-ab06-d7c97a66df39"/>
+				<reportElement uuid="0948a2fc-fc39-4f2d-ab06-d7c97a66df39" x="542" y="114" width="34" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.numasiento}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="576" y="114" width="36" height="26" uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca"/>
+				<reportElement uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca" x="576" y="114" width="36" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.numfoliosistema}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="139" y="114" width="43" height="26" uuid="2af7bea7-e8bf-424a-9813-c9d2be7c0459"/>
+				<reportElement uuid="2af7bea7-e8bf-424a-9813-c9d2be7c0459" x="139" y="114" width="43" height="26"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.dataMD}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="811" y="114" width="30" height="26" uuid="7b62e459-04bc-4227-be76-24bf5938d552"/>
+				<reportElement uuid="7b62e459-04bc-4227-be76-24bf5938d552" x="811" y="114" width="30" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.tipo}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="677" y="114" width="30" height="26" uuid="069eab80-7d6d-4dae-a598-c5014deb81f4"/>
+				<reportElement uuid="069eab80-7d6d-4dae-a598-c5014deb81f4" x="677" y="114" width="30" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.tipoDoc}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="1062" y="114" width="20" height="26" uuid="5105aee2-c3ec-4571-a14c-06b69218decc"/>
+				<reportElement uuid="5105aee2-c3ec-4571-a14c-06b69218decc" x="1062" y="114" width="20" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.tpp}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="1082" y="114" width="50" height="26" uuid="1fe1fad6-d193-4dc1-9696-5614ff9a10d0"/>
+				<reportElement uuid="1fe1fad6-d193-4dc1-9696-5614ff9a10d0" x="1082" y="114" width="50" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.status}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="983" y="114" width="27" height="26" uuid="f3655778-94dd-4fb6-8c84-cf32416201e0"/>
+				<reportElement uuid="f3655778-94dd-4fb6-8c84-cf32416201e0" x="983" y="114" width="27" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.seguro}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="1043" y="114" width="19" height="26" uuid="b68a4e34-b6e9-4006-8373-707c4e37eb31"/>
+				<reportElement uuid="b68a4e34-b6e9-4006-8373-707c4e37eb31" x="1043" y="114" width="19" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.utr}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="1010" y="114" width="33" height="26" uuid="c74391a0-cc07-44f7-90af-3036910e6bb3"/>
+				<reportElement uuid="c74391a0-cc07-44f7-90af-3036910e6bb3" x="1010" y="114" width="33" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.pedagio}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="342" y="114" width="26" height="26" uuid="aed6f61a-6566-451b-ba78-6964fb2c9f4e"/>
+				<reportElement uuid="aed6f61a-6566-451b-ba78-6964fb2c9f4e" x="342" y="114" width="26" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.codOrigem}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="441" y="114" width="33" height="26" uuid="2f7626c2-fbea-4cb7-808c-2d7dbbd18ee2"/>
+				<reportElement uuid="2f7626c2-fbea-4cb7-808c-2d7dbbd18ee2" x="441" y="114" width="33" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.codDestino}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="114" width="54" height="26" uuid="421120df-7852-4311-95a8-93478f8c4a5e"/>
+				<reportElement uuid="421120df-7852-4311-95a8-93478f8c4a5e" x="0" y="114" width="54" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.empresa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="54" y="114" width="55" height="26" uuid="24ef9240-77fe-4c43-b065-4aa214805b3e"/>
+				<reportElement uuid="24ef9240-77fe-4c43-b065-4aa214805b3e" x="54" y="114" width="55" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="612" y="114" width="21" height="26" uuid="9e0176f6-a8ff-4246-8038-34155064d017"/>
+				<reportElement uuid="9e0176f6-a8ff-4246-8038-34155064d017" x="612" y="114" width="21" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.ccf}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="950" y="114" width="33" height="26" uuid="97583aa4-45de-402c-8ce9-978c974d6e0c"/>
+				<reportElement uuid="97583aa4-45de-402c-8ce9-978c974d6e0c" x="950" y="114" width="33" height="26"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.tarifa}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="182" y="114" width="42" height="26" uuid="17200d3a-6195-42d1-bc36-ff2baffb56ce"/>
+				<reportElement uuid="17200d3a-6195-42d1-bc36-ff2baffb56ce" x="182" y="114" width="42" height="26"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.dataServico}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement x="0" y="140" width="1132" height="1" uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350"/>
+				<reportElement uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350" x="0" y="140" width="1132" height="1"/>
 			</line>
 			<textField>
-				<reportElement x="109" y="81" width="205" height="20" uuid="3541e1b0-8dfe-404e-9461-64d10d85531a"/>
+				<reportElement uuid="3541e1b0-8dfe-404e-9461-64d10d85531a" x="109" y="81" width="205" height="20"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$P{nomb_empresa}]]></textFieldExpression>
 			</textField>
 		</band>
@@ -339,210 +348,210 @@
 	<detail>
 		<band height="25" splitType="Prevent">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="224" y="0" width="33" height="23" uuid="3111776a-f727-4313-841c-55dabd804df4"/>
+				<reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" stretchType="RelativeToBandHeight" x="224" y="0" width="33" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{corridaId}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" pattern="HH:mm" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="314" y="0" width="28" height="23" uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48"/>
+			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
+				<reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" stretchType="RelativeToBandHeight" x="314" y="0" width="28" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{fechorviaje}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="739" y="0" width="39" height="23" uuid="6cc780bc-645e-4f03-a7d0-b4ecf7d4eb6c"/>
+				<reportElement uuid="6cc780bc-645e-4f03-a7d0-b4ecf7d4eb6c" stretchType="RelativeToBandHeight" x="739" y="0" width="39" height="23"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{desctipoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="707" y="0" width="32" height="23" uuid="37fa056d-c401-4268-a455-c5caf5e4eb54"/>
+				<reportElement uuid="37fa056d-c401-4268-a455-c5caf5e4eb54" stretchType="RelativeToBandHeight" x="707" y="0" width="32" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descnumdoc}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="869" y="0" width="40" height="23" uuid="d7019a40-a617-43c7-9ad2-b7c47fb38d60"/>
+				<reportElement uuid="d7019a40-a617-43c7-9ad2-b7c47fb38d60" stretchType="RelativeToBandHeight" x="869" y="0" width="40" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{porccategoria}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="909" y="0" width="41" height="23" uuid="f0161d55-b853-4318-8028-8aec04c0487d"/>
+				<reportElement uuid="f0161d55-b853-4318-8028-8aec04c0487d" stretchType="RelativeToBandHeight" x="909" y="0" width="41" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{preciopagado}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
-				<reportElement stretchType="RelativeToBandHeight" x="474" y="0" width="68" height="23" uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568"/>
+				<reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" stretchType="RelativeToBandHeight" x="474" y="0" width="68" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descdestino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="368" y="0" width="73" height="23" uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529"/>
+				<reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" stretchType="RelativeToBandHeight" x="368" y="0" width="73" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{descorigen}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="841" y="0" width="28" height="23" uuid="695d5bfa-16e3-4163-82a0-36d2a2ba21ed"/>
+				<reportElement uuid="695d5bfa-16e3-4163-82a0-36d2a2ba21ed" stretchType="RelativeToBandHeight" x="841" y="0" width="28" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{preciooriginal}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="778" y="0" width="33" height="23" uuid="f7539e74-4ab5-45e3-b3ca-b66967acc3e2"/>
+				<reportElement uuid="f7539e74-4ab5-45e3-b3ca-b66967acc3e2" stretchType="RelativeToBandHeight" x="778" y="0" width="33" height="23"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cvecategoria}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="542" y="0" width="34" height="23" uuid="8b89e606-e89c-4b3d-a5b5-4dfd339de5df"/>
+				<reportElement uuid="8b89e606-e89c-4b3d-a5b5-4dfd339de5df" stretchType="RelativeToBandHeight" x="542" y="0" width="34" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{numasiento}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1010" y="0" width="33" height="23" uuid="9e5ccd79-6850-4b3c-bfa1-405a96d3f826"/>
+				<reportElement uuid="9e5ccd79-6850-4b3c-bfa1-405a96d3f826" x="1010" y="0" width="33" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="1043" y="0" width="19" height="23" uuid="32e01305-63ee-444c-a4a7-e9246621ca83"/>
+				<reportElement uuid="32e01305-63ee-444c-a4a7-e9246621ca83" x="1043" y="0" width="19" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{utr}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement x="983" y="0" width="27" height="23" uuid="bff1a8a9-115f-4abf-811a-92ac988ca380"/>
+				<reportElement uuid="bff1a8a9-115f-4abf-811a-92ac988ca380" x="983" y="0" width="27" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement x="677" y="0" width="30" height="23" uuid="9df5776a-63e5-4480-81d5-34427fd79e23"/>
+				<reportElement uuid="9df5776a-63e5-4480-81d5-34427fd79e23" x="677" y="0" width="30" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tipoDoc}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement x="811" y="0" width="30" height="23" uuid="d75d9725-26ac-47f5-94db-995e5b49f30a"/>
+				<reportElement uuid="d75d9725-26ac-47f5-94db-995e5b49f30a" x="811" y="0" width="30" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement x="1062" y="0" width="20" height="23" uuid="fe98c2f8-b8cc-4f51-bf9d-9b767fe94088"/>
+				<reportElement uuid="fe98c2f8-b8cc-4f51-bf9d-9b767fe94088" x="1062" y="0" width="20" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tpp}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement x="1082" y="0" width="50" height="23" uuid="c6379bbf-bdfb-4600-b6ec-e1e9a6640c6d"/>
+				<reportElement uuid="c6379bbf-bdfb-4600-b6ec-e1e9a6640c6d" x="1082" y="0" width="50" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{status}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="342" y="0" width="26" height="23" uuid="8bdcad97-d2f3-443d-b2bb-2292e060a68e"/>
+				<reportElement uuid="8bdcad97-d2f3-443d-b2bb-2292e060a68e" stretchType="RelativeToBandHeight" x="342" y="0" width="26" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{codOrigem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="441" y="0" width="33" height="23" uuid="1c2892df-b5e0-4ef7-a4f2-3479e022d73c"/>
+				<reportElement uuid="1c2892df-b5e0-4ef7-a4f2-3479e022d73c" stretchType="RelativeToBandHeight" x="441" y="0" width="33" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{codDestino}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yy" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="54" height="23" uuid="8caf3414-13cb-49df-a75c-ebfa9840e025"/>
+				<reportElement uuid="8caf3414-13cb-49df-a75c-ebfa9840e025" stretchType="RelativeToBandHeight" x="0" y="0" width="54" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yy" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="54" y="0" width="55" height="23" uuid="b4bf2776-70de-48e8-8130-fd67cbbad3f3"/>
+				<reportElement uuid="b4bf2776-70de-48e8-8130-fd67cbbad3f3" stretchType="RelativeToBandHeight" x="54" y="0" width="55" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="109" y="0" width="30" height="23" uuid="1f3bab43-ae23-41b1-b5a6-a6c4c09fd359"/>
+				<reportElement uuid="1f3bab43-ae23-41b1-b5a6-a6c4c09fd359" stretchType="RelativeToBandHeight" x="109" y="0" width="30" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cveusuario}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="139" y="0" width="43" height="23" uuid="230fcb25-af91-4a54-b98e-a4477a3f5935"/>
+				<reportElement uuid="230fcb25-af91-4a54-b98e-a4477a3f5935" x="139" y="0" width="43" height="23"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{feccreacion}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="257" y="0" width="57" height="23" uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f"/>
+				<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" stretchType="RelativeToBandHeight" x="257" y="0" width="57" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="633" y="0" width="44" height="23" uuid="9c9861ac-780e-4e8b-aab8-9a4f506ce62b"/>
+				<reportElement uuid="9c9861ac-780e-4e8b-aab8-9a4f506ce62b" stretchType="RelativeToBandHeight" x="633" y="0" width="44" height="23"/>
 				<textElement textAlignment="Left">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nombpasajero}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="950" y="0" width="33" height="23" uuid="7a2eccbc-06b0-450a-bd27-6b1c669f408c"/>
+				<reportElement uuid="7a2eccbc-06b0-450a-bd27-6b1c669f408c" stretchType="RelativeToBandHeight" x="950" y="0" width="33" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="576" y="0" width="36" height="23" uuid="4177f54f-ba97-4731-8c32-c8fc23ce483a"/>
+				<reportElement uuid="4177f54f-ba97-4731-8c32-c8fc23ce483a" stretchType="RelativeToBandHeight" x="576" y="0" width="36" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{numfoliosistema}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="612" y="0" width="21" height="23" uuid="56de76ac-7bd5-489d-bb2f-5fdba2eb8f67"/>
+				<reportElement uuid="56de76ac-7bd5-489d-bb2f-5fdba2eb8f67" stretchType="RelativeToBandHeight" x="612" y="0" width="21" height="23"/>
 				<textElement>
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{ccf}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="182" y="0" width="42" height="23" uuid="dfd8ec54-db1c-49c7-b293-cd387e04dbb9"/>
+				<reportElement uuid="dfd8ec54-db1c-49c7-b293-cd387e04dbb9" x="182" y="0" width="42" height="23"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
@@ -553,12 +562,13 @@
 	<summary>
 		<band height="18">
 			<textField>
-				<reportElement x="0" y="0" width="139" height="18" uuid="5fdd8d50-c70b-4a5c-9621-5b91642257bf"/>
+				<reportElement uuid="5fdd8d50-c70b-4a5c-9621-5b91642257bf" x="0" y="0" width="139" height="18"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="182" y="0" width="75" height="18" uuid="6005f63d-1abc-408d-9af2-adea341fadda"/>
+				<reportElement uuid="6005f63d-1abc-408d-9af2-adea341fadda" x="182" y="0" width="75" height="18"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$V{qtde}]]></textFieldExpression>
 			</textField>
 		</band>
@@ -566,7 +576,8 @@
 	<noData>
 		<band height="25">
 			<textField>
-				<reportElement x="0" y="0" width="1132" height="20" uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620"/>
+				<reportElement uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620" x="0" y="0" width="1132" height="20"/>
+				<textElement/>
 				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
 			</textField>
 		</band>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java
index 5f5e559fb..4cd8c95e7 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java
@@ -13,7 +13,7 @@ public class RelatorioGratuidadeBean {
 	private Integer km;
 	private String linha;
 	private String corridaId;
-	private Date fechorviaje;
+	private String fechorviaje;
 	private String desctipoventa;
 	private String nombpasajero;
 	private String descnumdoc;
@@ -143,10 +143,10 @@ public class RelatorioGratuidadeBean {
 	public void setCorridaId(String corridaId) {
 		this.corridaId = corridaId;
 	}
-	public Date getFechorviaje() {
+	public String getFechorviaje() {
 		return fechorviaje;
 	}
-	public void setFechorviaje(Date fechorviaje) {
+	public void setFechorviaje(String fechorviaje) {
 		this.fechorviaje = fechorviaje;
 	}
 	public String getDesctipoventa() {