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 9cd8f8b85..b89c2082e 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoPosterior.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoPosterior.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoPosterior.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoPosterior.jrxml index 69e54062a..bb4536d5a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoPosterior.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoPosterior.jrxml @@ -1,13 +1,13 @@ - - - + + + - + @@ -51,12 +51,12 @@ - + - + @@ -69,9 +69,9 @@ - + - + @@ -140,7 +140,7 @@ - + @@ -162,150 +162,150 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +