From 113fe7319d359fdcd676634903c8f7f825a00803 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Wed, 17 Aug 2022 20:38:43 +0000 Subject: [PATCH] fixes bug#24794 AL-1100 qua: dev:Aristides git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@113886 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioEstornoCartao.java | 30 +++++- .../RelatorioEstornoCartao_pt_BR.properties | 3 +- .../templates/RelatorioEstornoCartao.jasper | Bin 48805 -> 49883 bytes .../templates/RelatorioEstornoCartao.jrxml | 94 ++++++++++-------- 4 files changed, 86 insertions(+), 41 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java index abf7069d1..3c3313c87 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java @@ -18,6 +18,13 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; * */ public class RelatorioEstornoCartao extends Relatorio { + + private final int CODIGO_TROCA_PASSAGEM_ID = 10; + private final int CODIGO_TRANSFERENCIA_PASSAGEM_ID = 23; + private final int CODIGO_CANCELAMENTO_ID = 31; + private final int CODIGO_DEVOLUCAO_ID = 32; + private final int CODIGO_GERACAOOCD_ID = 34; + private final int CODIGO_GERACAOOCDNEW_ID = 99; protected RelatorioEstornoCartao(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); @@ -50,6 +57,15 @@ public class RelatorioEstornoCartao extends Relatorio { if (parametros.get("CARTAO") != null && parametros.get("CARTAO") != "") { stmt.setString("cartao", parametros.get("CARTAO").toString()); } + + stmt.setInt("trocaPassagem", CODIGO_TROCA_PASSAGEM_ID); + stmt.setInt("transferenciaPassagem", CODIGO_TRANSFERENCIA_PASSAGEM_ID); + stmt.setInt("cancelamento", CODIGO_CANCELAMENTO_ID); + stmt.setInt("devolucao", CODIGO_DEVOLUCAO_ID); + stmt.setInt("geracaoocd", CODIGO_GERACAOOCD_ID); + stmt.setInt("geracaoocdnew", CODIGO_GERACAOOCDNEW_ID); + + ResultSet rset = stmt.executeQuery(); @@ -78,6 +94,7 @@ public class RelatorioEstornoCartao extends Relatorio { dataResult.put("agenciaVenda", rset.getString("agenciaVenda")); dataResult.put("formaPago", rset.getString("formaPago")); dataResult.put("nombempresa", rset.getString("nombempresa")); + dataResult.put("descmotivo", rset.getString("descmotivo")); this.dados.add(dataResult); } @@ -115,7 +132,8 @@ public class RelatorioEstornoCartao extends Relatorio { sql.append(" DEC.IMPORTETOTAL valorTransacao, "); sql.append(" pvBoleto.NUMPUNTOVENTA agenciaVenda, "); sql.append(" fp.descpago formaPago, "); - sql.append(" e.nombempresa "); + sql.append(" e.nombempresa, "); + sql.append(" mc.descmotivo "); sql.append(" FROM "); sql.append(" DADOS_ESTORNO_CARTAO DEC "); sql.append(" JOIN punto_venta pv "); @@ -140,6 +158,16 @@ public class RelatorioEstornoCartao extends Relatorio { sql.append(" JOIN EMPRESA e "); sql.append(" ON "); sql.append(" e.EMPRESA_ID = m.EMPRESA_ID "); + sql.append("JOIN caja c ON c.NUMOPERACION = dec.NUMOPERACION and"); + sql.append(" c.origen_id = dec.origen_id and"); + sql.append(" c.destino_id = dec.destino_id and"); + sql.append(" c.corrida_id = dec.corrida_id and"); + sql.append(" (c.motivocancelacion_id in "); + sql.append(" (:trocaPassagem, :transferenciaPassagem, :cancelamento, "); + sql.append(" :devolucao, :geracaoocd, :geracaoocdnew)) "); + sql.append("left OUTER JOIN motivo_cancelacion mc "); + sql.append("ON "); + sql.append(" c.motivocancelacion_id = mc.motivocancelacion_id "); sql.append(" WHERE "); sql.append(" dec.activo = 1 "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties index efab3c65f..537731883 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties @@ -33,4 +33,5 @@ bilhete.label=Bilhete valorTransacao.label=Valor Transação empresa.label=Empresa formaPago.label=Forma de Pagamento -pontoDeventa.label=Ponto de Venda \ No newline at end of file +pontoDeventa.label=Ponto de Venda +motivoCancelamento.label=Motivo Cancelamento \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper index 0314dbae24499afcec67c8f039ea814a55deff64..1daedfaf52e55e1c9b273101a795184a0ef335a2 100644 GIT binary patch literal 49883 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 delta 14944 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 - + @@ -37,6 +37,7 @@ + @@ -139,112 +140,112 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -272,32 +273,39 @@ - + - + - + + + + + + + + - + @@ -305,21 +313,21 @@ - + - + - + @@ -327,70 +335,70 @@ - + - + - + - + - + - + - + - + - + - + @@ -418,7 +426,7 @@ - + @@ -426,14 +434,14 @@ - + - + @@ -441,19 +449,27 @@ - + - + + + + + + + + +