From 6eb7a2879d5c58229c36ba6a55641d817a14a772 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Tue, 17 Jan 2023 12:06:51 -0300 Subject: [PATCH] =?UTF-8?q?fixes=20bug#AL-1518=20Ordena=C3=A7=C3=A3o=20dos?= =?UTF-8?q?=20campos=20de=20acordo=20com=20a=20spec,=20melhorias,=20campo?= =?UTF-8?q?=20NSUHost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../impl/RelatorioEstornoCartao.java | 19 +- .../RelatorioEstornoCartao_es.properties | 3 +- .../RelatorioEstornoCartao_pt_BR.properties | 3 +- .../templates/RelatorioEstornoCartao.jasper | Bin 53402 -> 54444 bytes .../templates/RelatorioEstornoCartao.jrxml | 219 ++++++++++-------- 6 files changed, 140 insertions(+), 106 deletions(-) diff --git a/pom.xml b/pom.xml index 4ef572e32..0a314cd6e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.37 + 1.0.39 war 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..c0979d626 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=Adquirente +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..32e5703fb 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=Adquirente +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..10b1f0dfcb147952f180b59816c18f1a95e99df9 100644 GIT binary patch literal 54444 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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..962b0873b 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 @@ + + + @@ -64,173 +67,180 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + + + + + + + + @@ -342,177 +352,184 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - + + + + + + + + + + + + + + + + @@ -521,7 +538,7 @@ - +