From a3c7cde8910463c76d464064434d96128e36aee4 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Mon, 2 Jan 2023 10:55:06 -0300 Subject: [PATCH 1/4] fixes bug# AL-1904 qua:Juliane --- .../impl/RelatorioEstornoCartao.java | 19 ++++++++++-- .../RelatorioEstornoCartao_es.properties | 3 +- .../RelatorioEstornoCartao_pt_BR.properties | 3 +- .../templates/RelatorioEstornoCartao.jasper | Bin 53402 -> 54439 bytes .../templates/RelatorioEstornoCartao.jrxml | 29 ++++++++++++++---- 5 files changed, 44 insertions(+), 10 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java index 094b96680..143a52388 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java @@ -82,6 +82,7 @@ public class RelatorioEstornoCartao extends Relatorio { dataResult.put("descmotivo", rset.getString("descmotivo")); dataResult.put("adquirente", rset.getString("adquirente")); dataResult.put("estabelecimento", rset.getString("estabelecimento")); + dataResult.put("nsuhost", rset.getString("nsuhost")); this.dados.add(dataResult); @@ -136,7 +137,21 @@ public class RelatorioEstornoCartao extends Relatorio { sql.append(" AND c.corrida_id = dec.corrida_id "); sql.append(" AND c.numfoliosistema = dec.numfoliosistema "); sql.append(" AND c.indreimpresion = 1 "); - sql.append(" AND rownum = 1), 'CANCELAMENTO') as descmotivo "); + sql.append(" AND rownum = 1), 'CANCELAMENTO') as descmotivo, "); + + //SubSelect para evitar duplicacao dos registros por causa do join com a caja + sql.append(" COALESCE(( select ct.nsuhost "); + sql.append(" from caja c inner join caja_formapago cfp on cfp.caja_id = c.caja_id "); + sql.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id "); + sql.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); + sql.append(" inner join forma_pago fp on fp.formapago_id = cfp.formapago_id "); + sql.append(" where "); + sql.append(" c.numoperacion = dec.numoperacion "); + sql.append(" AND c.origen_id = dec.origen_id "); + sql.append(" AND c.destino_id = dec.destino_id "); + sql.append(" AND c.corrida_id = dec.corrida_id "); + sql.append(" AND coalesce( ct.nsuhost, '0') <> '0' "); + sql.append(" AND rownum = 1), '') as nsuhost "); sql.append(" FROM "); @@ -187,7 +202,7 @@ public class RelatorioEstornoCartao extends Relatorio { } sql.append(" AND DEC.FECREGISTRO BETWEEN :data_inicial AND :data_final "); - sql.append(" ORDER BY DEC.FECREGISTRO "); + sql.append(" ORDER BY e.nombempresa, DEC.FECREGISTRO "); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties index 660477569..e59e2254a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties @@ -35,4 +35,5 @@ empresa.label=Empresa: formaPago.label=Forma de Pagamento pontoDeventa.label=Ponto de Venda estabelecimento.label=Estab. -adquirente.label=Adquirente \ No newline at end of file +adquirente.label=Adqui. +nsuhost.label=NSU/Host \ No newline at end of file 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 38f51c05d..5d726ed94 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 @@ -36,4 +36,5 @@ formaPago.label=Forma de Pagamento pontoDeventa.label=Ponto de Venda motivoCancelamento.label=Motivo Cancelamento estabelecimento.label=Estab. -adquirente.label=Adquirente \ No newline at end of file +adquirente.label=Adqui. +nsuhost.label=NSU/Host \ 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 6f843fc3b8ed73eae20e5b0d96d557a2058b1f01..eedcdbcdf2b07c0820cf9d46f804c121decdb676 100644 GIT binary patch literal 54439 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml index 326e9f6c7..2ffd37098 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml @@ -44,6 +44,9 @@ + + + @@ -183,14 +186,14 @@ - + - + @@ -218,7 +221,7 @@ - + @@ -231,6 +234,13 @@ + + + + + + + @@ -449,14 +459,14 @@ - + - + @@ -500,7 +510,7 @@ - + @@ -513,6 +523,13 @@ + + + + + + + From 303c52d096ffed1b7fb3ff49aecd06801984699b Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Mon, 2 Jan 2023 11:35:06 -0300 Subject: [PATCH 2/4] fixes bug# AL-1904 qua:Debora Incluindo o campo NSU/HOST no relatoio. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8129678c3..984146936 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.17 + 1.0.18 war @@ -55,7 +55,7 @@ br.com.rjconsultores ModelWeb - 1.0.13 + 1.0.12 From 37dac836af190e6d75f71b1103d2ae7626618c5f Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Tue, 3 Jan 2023 14:00:27 -0300 Subject: [PATCH 3/4] AL-1904 - Atualizando o arquivo pom para resolver o conflito --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 984146936..5f4d1e52d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.18 + 1.0.30 war From 8c5fb83828508f6939bd7300a861f382c932dfb0 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Tue, 3 Jan 2023 15:39:21 -0300 Subject: [PATCH 4/4] Conflito POM --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c06db566c..dc8838e06 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ br.com.rjconsultores ModelWeb - 1.0.12 + ${modelWeb.version}