From a61f40e7fc8eaa151face8ad159861cd62a04a00 Mon Sep 17 00:00:00 2001 From: fabio Date: Tue, 24 Oct 2017 13:37:16 +0000 Subject: [PATCH] Fixes bug #9450 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@75610 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioImpressaoPosterior.java | 10 +-- .../RelatorioImpressaoPosterior.jasper | Bin 43041 -> 43104 bytes .../RelatorioImpressaoPosterior.jrxml | 62 +++++++++--------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoPosterior.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoPosterior.java index 7b24bfbd1..c40ca64b8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoPosterior.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoPosterior.java @@ -14,6 +14,7 @@ import org.slf4j.Logger; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioImpressaoPosteriorBean; +import com.rjconsultores.ventaboletos.utilerias.LocalizadorHelper; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; @@ -97,13 +98,15 @@ public class RelatorioImpressaoPosterior extends Relatorio { } rset1= stmt.executeQuery(); + + LocalizadorHelper helper = new LocalizadorHelper(); while (rset1.next()) { RelatorioImpressaoPosteriorBean ImpressaoPosterior = new RelatorioImpressaoPosteriorBean(); ImpressaoPosterior.setEmpresa(rset1.getString("empresa")); ImpressaoPosterior.setDocumento(rset1.getString("documento")); - ImpressaoPosterior.setLocalizador(rset1.getString("localizador")); + ImpressaoPosterior.setLocalizador(helper.getLocalizadorAlfa(rset1.getString("localizador"))); ImpressaoPosterior.setNome(rset1.getString("nome")); ImpressaoPosterior.setReserva(rset1.getString("reserva")); ImpressaoPosterior.setOrigem(rset1.getString("origem")); @@ -142,7 +145,7 @@ public class RelatorioImpressaoPosterior extends Relatorio { sql.append(" ORIGINAL.DESCNUMDOC as documento, "); sql.append(" ORIGINAL.NUMOPERACION as localizador, "); sql.append(" ORIGINAL.NOMBPASAJERO as nome, "); - sql.append(" ORIGINAL.NUMRESERVACION as reserva, "); + sql.append(" ORIGINAL.NUMFOLIOSISTEMA as reserva, "); sql.append(" po.DESCPARADA as origem, "); sql.append(" pd.DESCPARADA as destino, "); sql.append(" ORIGINAL.DESCTELEFONO as telefone, "); @@ -152,8 +155,7 @@ public class RelatorioImpressaoPosterior extends Relatorio { sql.append(" INNER JOIN EMPRESA e ON ORIGINAL.EMPRESACORRIDA_ID = e.EMPRESA_ID "); sql.append(" INNER JOIN PARADA po ON (original.ORIGEN_ID = po.PARADA_ID) "); sql.append(" INNER JOIN PARADA pd ON (original.DESTINO_ID = pd.PARADA_ID) "); - sql.append(" WHERE ORIGINAL.INDSTATUSBOLETO = 'V' "); - sql.append(" AND ORIGINAL.TIPOVENTA_ID IN (5,12,18,41,49) "); + sql.append(" WHERE ORIGINAL.TIPOVENTA_ID IN (5,12,18,41,49) "); sql.append(" AND (original.MOTIVOCANCELACION_ID is null or original.MOTIVOCANCELACION_ID = 16 ) "); if( StringUtils.isNotEmpty(datVendaInicial) ) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoPosterior.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoPosterior.jasper index 9cd8f8b850018412bc839211bf663b6519ac8f36..b89c2082eff96c25e6448d1a8722d4536f99da83 100644 GIT binary patch delta 4757 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 - - - + + + - + @@ -51,12 +51,12 @@ - + - + @@ -69,9 +69,9 @@ - + - + @@ -140,7 +140,7 @@ - + @@ -162,150 +162,150 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +