diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCorridas.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCorridas.java index c4d4959a8..5afe5f028 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCorridas.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCorridas.java @@ -10,6 +10,7 @@ import java.util.Map; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; +import com.rjconsultores.ventaboletos.enums.IndStatusBoleto; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioCorridasBean; @@ -70,6 +71,7 @@ public class RelatorioCorridas extends Relatorio { corrida.setClaseServicio((String) rset.getObject("claseServicio")); corrida.setDataVenda((Date) rset.getObject("dataVenda")); corrida.setDataViaje((Date) rset.getObject("dataViaje")); + corrida.setStatus( IndStatusBoleto.getDescricao( rset.getString("status") )); BigDecimal tassas = BigDecimal.ZERO; tassas = tassas.add(corrida.getImporteOutros() != null ? corrida.getImporteOutros() : BigDecimal.ZERO); @@ -112,7 +114,8 @@ public class RelatorioCorridas extends Relatorio { sb.append(" b.importeseguro as importeSeguro, "); sb.append(" b.preciopagado as precioPagado, "); sb.append(" b.numkmviaje as numKmViaje, "); - sb.append(" cs.descclase as claseServicio "); + sb.append(" cs.descclase as claseServicio, "); + sb.append(" b.INDSTATUSBOLETO as status "); sb.append("from boleto b "); sb.append(" left join marca m on m.marca_id = b.marca_id "); sb.append(" left join empresa e on e.empresa_id = m.empresa_id "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCorridas_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCorridas_pt_BR.properties index 8acbe623e..1bc93c9fc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCorridas_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCorridas_pt_BR.properties @@ -18,11 +18,12 @@ label.claseServicio=Classe label.origem=Origem label.destino=Destino label.numKmViaje=Distância -label.poltrona=Po. +label.poltrona=Pol. label.precioPagado=Tarifa label.precioTaxas=Taxas label.preco=Tarifa Total label.categoria=Tipo Pax label.dataVenda=Data Compra label.pontoVenda=Agência -label.nomeUsuario=Bilheteiro \ No newline at end of file +label.nomeUsuario=Bilheteiro +label.status=Situação \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jasper index ff27a5e9f..d78adfda8 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jrxml index 46e9a23a3..105dcb19b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jrxml @@ -1,8 +1,13 @@ - - - + + + + + + + + @@ -26,318 +31,531 @@ + <band height="102" splitType="Stretch"> <textField> - <reportElement x="69" y="20" width="733" height="20" uuid="bdb170bb-bfe6-4ea2-8702-2df0b015cd7d"/> + <reportElement x="141" y="20" width="1023" height="20" uuid="bdb170bb-bfe6-4ea2-8702-2df0b015cd7d"/> <textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="0" width="653" height="20" uuid="f6fe1c2b-09af-45e6-9883-f6aa7fe3016c"/> + <reportElement x="0" y="0" width="1015" height="20" uuid="f6fe1c2b-09af-45e6-9883-f6aa7fe3016c"/> <textElement markup="none"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{header.titulo.relatorio}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="20" width="69" height="20" uuid="3d8e6261-3551-411a-ab47-8ed23e80f41e"/> + <reportElement x="0" y="20" width="141" height="20" uuid="3d8e6261-3551-411a-ab47-8ed23e80f41e"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression> </textField> <textField> - <reportElement x="69" y="40" width="334" height="20" uuid="6c1cdde2-67c3-4a56-9744-5a4d249115f9"/> + <reportElement x="141" y="40" width="371" height="20" uuid="6c1cdde2-67c3-4a56-9744-5a4d249115f9"/> <textFieldExpression><![CDATA[$P{ORIGEN}]]></textFieldExpression> </textField> <textField> - <reportElement x="472" y="40" width="330" height="20" uuid="2879d620-3c3b-465f-9459-f94154b9e9c7"/> + <reportElement x="591" y="40" width="463" height="20" uuid="2879d620-3c3b-465f-9459-f94154b9e9c7"/> <textFieldExpression><![CDATA[$P{DESTINO}]]></textFieldExpression> </textField> <textField> - <reportElement x="69" y="60" width="334" height="20" uuid="06d06c40-6984-4a32-90e2-48e1d8cdcc9b"/> + <reportElement x="141" y="60" width="1023" height="20" uuid="06d06c40-6984-4a32-90e2-48e1d8cdcc9b"/> <textFieldExpression><![CDATA[$P{CORRIDA_ID}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="40" width="69" height="20" uuid="577578e8-3add-42a2-88c0-df7647b59844"/> + <reportElement x="0" y="40" width="141" height="20" uuid="577578e8-3add-42a2-88c0-df7647b59844"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.origem}]]></textFieldExpression> </textField> <textField> - <reportElement x="403" y="40" width="69" height="20" uuid="4f697f82-2de4-4665-af6f-4cc16270d631"/> + <reportElement x="512" y="40" width="79" height="20" uuid="4f697f82-2de4-4665-af6f-4cc16270d631"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.destino}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="60" width="69" height="20" uuid="20a767f1-d0d5-4485-9d6c-3c762e97bc70"/> + <reportElement x="0" y="60" width="141" height="20" uuid="20a767f1-d0d5-4485-9d6c-3c762e97bc70"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.servico}]]></textFieldExpression> </textField> <textField> - <reportElement x="653" y="0" width="149" height="20" uuid="96572021-01f9-4d05-938c-11ca5721f81c"/> + <reportElement x="1015" y="0" width="149" height="20" uuid="96572021-01f9-4d05-938c-11ca5721f81c"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="80" width="69" height="20" uuid="e24ed6f5-a072-4bda-b735-ef26b59fa179"/> + <reportElement x="0" y="80" width="141" height="20" uuid="e24ed6f5-a072-4bda-b735-ef26b59fa179"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.data.de}]]></textFieldExpression> </textField> <textField> - <reportElement x="268" y="80" width="69" height="20" uuid="efc3193a-c42a-4935-95ee-84f086336574"/> + <reportElement x="512" y="80" width="79" height="20" uuid="efc3193a-c42a-4935-95ee-84f086336574"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.data.ate}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="69" y="80" width="199" height="20" uuid="110852df-8752-44d8-98ae-534a5cb8d5e2"/> + <reportElement x="141" y="80" width="371" height="20" uuid="110852df-8752-44d8-98ae-534a5cb8d5e2"/> <textFieldExpression><![CDATA[$P{DATA_DE}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="337" y="80" width="218" height="20" uuid="4d410653-2490-49ff-b176-530feaeab535"/> + <reportElement x="591" y="80" width="463" height="20" uuid="4d410653-2490-49ff-b176-530feaeab535"/> <textFieldExpression><![CDATA[$P{DATA_ATE}]]></textFieldExpression> </textField> - <line> - <reportElement x="0" y="100" width="802" height="1" uuid="7486e02d-1b43-45ab-b044-1a1d6ffdd364"/> - </line> </band> - - - + + + + + + + + + - - - - - - + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + @@ -350,9 +568,9 @@ - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioCorridasBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioCorridasBean.java index e90134dcd..705d6a838 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioCorridasBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioCorridasBean.java @@ -19,6 +19,7 @@ public class RelatorioCorridasBean { private String tipoPagamento; private String categoria; private String empresa; + private String status; private BigDecimal importeTaxaEmbarque; private BigDecimal importePedagio; private BigDecimal importeOutros; @@ -216,4 +217,12 @@ public class RelatorioCorridasBean { this.claseServicio = claseServicio; } + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + }