diff --git a/README.md b/README.md index dc2f6d3a1..020da3ab5 100644 --- a/README.md +++ b/README.md @@ -56,4 +56,5 @@ ou usar o - + + @@ -57,6 +58,7 @@ + @@ -71,297 +73,303 @@ - + + + + + + + + + - <band height="144"> + <band height="145"> <textField> - <reportElement uuid="652312bd-292a-424d-a234-5f157e3699c6" x="0" y="0" width="314" height="37"/> - <textElement/> + <reportElement x="0" y="0" width="314" height="37" uuid="652312bd-292a-424d-a234-5f157e3699c6"/> <textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="37" width="109" height="23"/> - <textElement/> + <reportElement x="0" y="37" width="109" height="23" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/> <textFieldExpression><![CDATA[$R{header.periodo.viagem}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60" x="633" y="37" width="106" height="23"/> - <textElement/> + <reportElement x="633" y="37" width="106" height="23" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/> <textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression> </textField> <textField evaluationTime="Report"> - <reportElement uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f" x="811" y="37" width="30" height="23"/> + <reportElement x="811" y="37" width="30" height="23" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="739" y="37" width="39" height="23"/> - <textElement/> + <reportElement x="739" y="37" width="39" height="23" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/> <textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="109" y="37" width="205" height="23"/> - <textElement/> + <reportElement x="109" y="37" width="205" height="23" uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50"/> <textFieldExpression><![CDATA[( $P{fecInicioViagem} != null ? ($P{fecInicioViagem} + " à " + $P{fecFinalViagem}) : "" )]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement uuid="6f671365-868e-41a6-81ee-a308d1d91e1d" x="739" y="0" width="102" height="37"/> + <reportElement x="739" y="0" width="102" height="37" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/> <textElement textAlignment="Left"/> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a" x="778" y="37" width="33" height="23"/> + <reportElement x="778" y="37" width="33" height="23" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="a79c03e0-bbe4-4b1c-8297-533a0d137b27" x="0" y="60" width="109" height="21"/> - <textElement/> + <reportElement x="0" y="60" width="109" height="21" uuid="a79c03e0-bbe4-4b1c-8297-533a0d137b27"/> <textFieldExpression><![CDATA[$R{header.periodo.venda}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335" x="109" y="60" width="205" height="21"/> - <textElement/> + <reportElement x="109" y="60" width="205" height="21" uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335"/> <textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) : "" )]]></textFieldExpression> </textField> <textField> - <reportElement uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0" x="0" y="81" width="109" height="20"/> - <textElement/> + <reportElement x="0" y="81" width="109" height="20" uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0"/> <textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb" x="361" y="114" width="55" height="26"/> + <reportElement x="412" y="114" width="55" height="26" uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="e18edb89-17f4-417e-8041-664f11245cbd" x="449" y="114" width="55" height="26"/> + <reportElement x="500" y="114" width="55" height="26" uuid="e18edb89-17f4-417e-8041-664f11245cbd"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="67851ba5-cc9c-4f37-8857-9e3c5be9b362" x="257" y="114" width="50" height="26"/> + <reportElement x="308" y="114" width="50" height="26" uuid="67851ba5-cc9c-4f37-8857-9e3c5be9b362"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="93fedb4f-18e2-4d95-82e8-2108d3eb135c" x="224" y="114" width="33" height="26"/> + <reportElement x="224" y="114" width="33" height="26" uuid="93fedb4f-18e2-4d95-82e8-2108d3eb135c"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.servicio}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="3de0b54a-0b10-4556-9b0a-ba8f19989716" x="307" y="114" width="28" height="26"/> + <reportElement x="358" y="114" width="28" height="26" uuid="3de0b54a-0b10-4556-9b0a-ba8f19989716"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="cc834009-ae90-46d4-8bbb-37578b69f621" x="735" y="114" width="39" height="26"/> + <reportElement x="786" y="114" width="39" height="26" uuid="cc834009-ae90-46d4-8bbb-37578b69f621"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.tipobilhete}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb" x="591" y="114" width="44" height="26"/> + <reportElement x="642" y="114" width="44" height="26" uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.pasajero}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af" x="665" y="114" width="32" height="26"/> + <reportElement x="716" y="114" width="32" height="26" uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af"/> <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.documento}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333" x="837" y="114" width="28" height="26"/> + <reportElement x="888" y="114" width="28" height="26" uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.precio}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="e14732be-42a0-4f54-9eb2-52f10ece154b" x="865" y="114" width="37" height="26"/> + <reportElement x="916" y="114" width="37" height="26" uuid="e14732be-42a0-4f54-9eb2-52f10ece154b"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.desconto}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3" x="902" y="114" width="41" height="26"/> + <reportElement x="953" y="114" width="41" height="26" uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.valorCobrado}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="bb3d2388-6bda-4727-ba30-0a5f4612f1a8" x="109" y="114" width="30" height="26"/> + <reportElement x="109" y="114" width="30" height="26" uuid="bb3d2388-6bda-4727-ba30-0a5f4612f1a8"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.bilheteiro}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="6b1fac8d-c098-4893-b1dd-7b64573f0173" x="774" y="114" width="33" height="26"/> + <reportElement x="825" y="114" width="33" height="26" uuid="6b1fac8d-c098-4893-b1dd-7b64573f0173"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.tipopassagem}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="0948a2fc-fc39-4f2d-ab06-d7c97a66df39" x="505" y="114" width="34" height="26"/> + <reportElement x="556" y="114" width="34" height="26" uuid="0948a2fc-fc39-4f2d-ab06-d7c97a66df39"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.numasiento}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca" x="539" y="114" width="33" height="26"/> + <reportElement x="590" y="114" width="33" height="26" uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.numfoliosistema}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="2af7bea7-e8bf-424a-9813-c9d2be7c0459" x="139" y="114" width="43" height="26"/> + <reportElement x="139" y="114" width="43" height="26" uuid="2af7bea7-e8bf-424a-9813-c9d2be7c0459"/> <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.dataMD}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="7b62e459-04bc-4227-be76-24bf5938d552" x="807" y="114" width="30" height="26"/> + <reportElement x="858" y="114" width="30" height="26" uuid="7b62e459-04bc-4227-be76-24bf5938d552"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.tipo}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="069eab80-7d6d-4dae-a598-c5014deb81f4" x="635" y="114" width="30" height="26"/> + <reportElement x="686" y="114" width="30" height="26" uuid="069eab80-7d6d-4dae-a598-c5014deb81f4"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.tipoDoc}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="5105aee2-c3ec-4571-a14c-06b69218decc" x="1045" y="114" width="17" height="26"/> + <reportElement x="1096" y="114" width="17" height="26" uuid="5105aee2-c3ec-4571-a14c-06b69218decc"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.tpp}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="1fe1fad6-d193-4dc1-9696-5614ff9a10d0" x="1098" y="114" width="33" height="26"/> + <reportElement x="1149" y="114" width="33" height="26" uuid="1fe1fad6-d193-4dc1-9696-5614ff9a10d0"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.status}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="f3655778-94dd-4fb6-8c84-cf32416201e0" x="973" y="114" width="25" height="26"/> + <reportElement x="1024" y="114" width="25" height="26" uuid="f3655778-94dd-4fb6-8c84-cf32416201e0"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.seguro}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="b68a4e34-b6e9-4006-8373-707c4e37eb31" x="1028" y="114" width="17" height="26"/> + <reportElement x="1079" y="114" width="17" height="26" uuid="b68a4e34-b6e9-4006-8373-707c4e37eb31"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.utr}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="c74391a0-cc07-44f7-90af-3036910e6bb3" x="998" y="114" width="30" height="26"/> + <reportElement x="1049" y="114" width="30" height="26" uuid="c74391a0-cc07-44f7-90af-3036910e6bb3"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.pedagio}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="aed6f61a-6566-451b-ba78-6964fb2c9f4e" x="335" y="114" width="26" height="26"/> + <reportElement x="386" y="114" width="26" height="26" uuid="aed6f61a-6566-451b-ba78-6964fb2c9f4e"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.codOrigem}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="2f7626c2-fbea-4cb7-808c-2d7dbbd18ee2" x="416" y="114" width="33" height="26"/> + <reportElement x="467" y="114" width="33" height="26" uuid="2f7626c2-fbea-4cb7-808c-2d7dbbd18ee2"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.codDestino}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="421120df-7852-4311-95a8-93478f8c4a5e" x="0" y="114" width="54" height="26"/> + <reportElement x="0" y="114" width="54" height="26" uuid="421120df-7852-4311-95a8-93478f8c4a5e"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.empresa}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="24ef9240-77fe-4c43-b065-4aa214805b3e" x="54" y="114" width="55" height="26"/> + <reportElement x="54" y="114" width="55" height="26" uuid="24ef9240-77fe-4c43-b065-4aa214805b3e"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="9e0176f6-a8ff-4246-8038-34155064d017" x="572" y="114" width="19" height="26"/> + <reportElement x="623" y="114" width="19" height="26" uuid="9e0176f6-a8ff-4246-8038-34155064d017"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.ccf}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="97583aa4-45de-402c-8ce9-978c974d6e0c" x="943" y="114" width="30" height="26"/> + <reportElement x="994" y="114" width="30" height="26" uuid="97583aa4-45de-402c-8ce9-978c974d6e0c"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.tarifa}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="17200d3a-6195-42d1-bc36-ff2baffb56ce" x="182" y="114" width="42" height="26"/> + <reportElement x="182" y="114" width="42" height="26" uuid="17200d3a-6195-42d1-bc36-ff2baffb56ce"/> <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.dataServico}]]></textFieldExpression> </textField> <line> - <reportElement uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350" x="0" y="140" width="1132" height="1"/> + <reportElement x="0" y="140" width="1132" height="1" uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350"/> </line> <textField> - <reportElement uuid="3541e1b0-8dfe-404e-9461-64d10d85531a" x="109" y="81" width="205" height="20"/> - <textElement/> + <reportElement x="109" y="81" width="205" height="20" uuid="3541e1b0-8dfe-404e-9461-64d10d85531a"/> <textFieldExpression><![CDATA[$P{nomb_empresa}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="31514fcb-1c10-41ba-9e10-7903ee73f607" x="1062" y="114" width="36" height="26"/> + <reportElement x="1113" y="114" width="36" height="26" uuid="31514fcb-1c10-41ba-9e10-7903ee73f607"/> <textElement> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.chaveBPe}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="72f2ffff-f6a7-4a82-a884-a2c6c3f38d31" x="697" y="114" width="38" height="26"/> + <reportElement x="748" y="114" width="38" height="26" uuid="72f2ffff-f6a7-4a82-a884-a2c6c3f38d31"/> <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$R{detail.telefone}]]></textFieldExpression> </textField> + <textField> + <reportElement x="258" y="114" width="50" height="26" uuid="9c91c7b3-76a9-4198-8f24-d9a80110ea4c"/> + <textElement> + <font size="7"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.prefixo}]]></textFieldExpression> + </textField> </band> @@ -370,285 +378,292 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + - + - + - + - + - + - + - + - + @@ -659,8 +674,7 @@ - - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java index 41b50b018..09927ffa5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java @@ -11,6 +11,7 @@ public class RelatorioGratuidadeBean { private String destino; private String descdestino; private Integer km; + private String prefixo; private String linha; private String corridaId; private String fechorviaje; @@ -154,6 +155,12 @@ public class RelatorioGratuidadeBean { public void setKm(Integer km) { this.km = km; } + public String getPrefixo() { + return prefixo; + } + public void setPrefixo(String prefixo) { + this.prefixo = prefixo; + } public String getLinha() { return linha; }