From cbda594e1a14944fa78325a8202cfe627e3bd37d Mon Sep 17 00:00:00 2001 From: walace Date: Mon, 7 Mar 2022 17:59:11 +0000 Subject: [PATCH] fixes bug#24103 qua: dev: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@111135 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasConexaoRuta.java | 4 +- .../RelatorioVendasConexaoRuta.jasper | Bin 53113 -> 53099 bytes .../RelatorioVendasConexaoRuta.jrxml | 423 ++++++++++-------- .../RelatorioVendasConexaoRutaBean.java | 12 +- 4 files changed, 249 insertions(+), 190 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java index bd74585b5..51b725cea 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java @@ -107,9 +107,9 @@ public class RelatorioVendasConexaoRuta extends Relatorio { bean.setPoltrona((String) rset.getObject("poltrona")); bean.setNumLinha((Integer) rset.getInt("numLinha")); bean.setDescricaoLinha((String) rset.getObject("descricaoLinha")); - bean.setCodOrigem((Integer) rset.getInt("codOrigem")); + bean.setCodOrigem((String) rset.getString("codOrigem")); bean.setDescricaoOrigem((String) rset.getObject("descricaoOrigem")); - bean.setCodDestino((Integer) rset.getInt("codDestino")); + bean.setCodDestino((String) rset.getString("codDestino")); bean.setDescricaoDestino((String) rset.getObject("descricaoDestino")); bean.setDataEmbarque((Date) rset.getObject("dataEmbarque")); bean.setDataVenda((Date) rset.getObject("dataVenda")); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jasper index 9b7a22fcda778207ee9e3cf03a5be4bccfb4d5f9..9b2686eba517dedd009c5e9b8d5e3041f9b83ab6 100644 GIT binary patch delta 7514 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 delta 7519 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jrxml index b80b3a241..63b9a738b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasConexaoRuta.jrxml @@ -1,5 +1,5 @@ - + @@ -18,8 +18,8 @@ - - + + @@ -46,404 +46,460 @@ <band height="32"> <textField> - <reportElement x="0" y="0" width="802" height="32"/> - <textElement textAlignment="Center" verticalAlignment="Middle" lineSpacing="Single"> + <reportElement uuid="cf19e107-c7c8-410c-8957-a0bd2259aa5c" x="0" y="0" width="802" height="32"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="18" isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$R{cabecalho.nome}]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression> </textField> </band> - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + @@ -453,39 +509,42 @@ - + - - + + + - + - - + + + - + - + - - + + + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasConexaoRutaBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasConexaoRutaBean.java index 0de842ea6..4bb20cb42 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasConexaoRutaBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasConexaoRutaBean.java @@ -12,9 +12,9 @@ public class RelatorioVendasConexaoRutaBean { private String bilhete; private Integer numLinha; private String descricaoLinha; - private Integer codOrigem; + private String codOrigem; private String descricaoOrigem; - private Integer codDestino; + private String codDestino; private String descricaoDestino; private Integer servico; private String poltrona; @@ -90,11 +90,11 @@ public class RelatorioVendasConexaoRutaBean { this.descricaoLinha = descricaoLinha; } - public Integer getCodOrigem() { + public String getCodOrigem() { return codOrigem; } - public void setCodOrigem(Integer codOrigem) { + public void setCodOrigem(String codOrigem) { this.codOrigem = codOrigem; } @@ -106,11 +106,11 @@ public class RelatorioVendasConexaoRutaBean { this.descricaoOrigem = descricaoOrigem; } - public Integer getCodDestino() { + public String getCodDestino() { return codDestino; } - public void setCodDestino(Integer codDestino) { + public void setCodDestino(String codDestino) { this.codDestino = codDestino; }