From 8e75f28d956063d39967ca40e90c8c92b7124895 Mon Sep 17 00:00:00 2001 From: aristides Date: Tue, 1 Jun 2021 18:09:33 +0000 Subject: [PATCH] fixes bug#22144 qua:Debora dev: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@106998 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioTaxasLinha.java | 5 ++++- .../impl/RelatorioW2IAnalitico.java | 4 ++-- .../templates/RelatorioTaxasLinha.jasper | Bin 72495 -> 72444 bytes .../templates/RelatorioTaxasLinha.jrxml | 21 ++++-------------- .../templates/RelatorioW2IAnalitico.jasper | Bin 43266 -> 43264 bytes .../templates/RelatorioW2IAnalitico.jrxml | 5 ++--- .../templates/RelatorioW2ISintetico.jasper | Bin 44880 -> 44923 bytes .../templates/RelatorioW2ISintetico.jrxml | 6 +---- 8 files changed, 13 insertions(+), 28 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java index dc51c9fc5..41a5b5b1c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java @@ -51,6 +51,7 @@ public class RelatorioTaxasLinha extends Relatorio { Boolean isTxEmbarque = (Boolean) parametros.get("IS_TX_EMBARQUE"); Boolean isPedagio = (Boolean) parametros.get("IS_PEDAGIO"); Boolean isSeguro = (Boolean) parametros.get("IS_SEGURO"); + Boolean isSeguroW2I = (Boolean) parametros.get("IS_SEGUROOPCIONAL"); lsDadosRelatorio = new ArrayList(); @@ -198,6 +199,8 @@ public class RelatorioTaxasLinha extends Relatorio { isValidado = true; }else if( importePedagio.doubleValue() > 0 && isPedagio ) { isValidado = true; + }else if((taxasLinha.getTotalValorSeguroOpcionalCancelado().compareTo(BigDecimal.ZERO)==1 || taxasLinha.getTotalValorseguroOpcionalVendido().compareTo(BigDecimal.ZERO)==1) && isSeguroW2I ) { + isValidado = true; } if( isValidado ) { @@ -289,7 +292,7 @@ public class RelatorioTaxasLinha extends Relatorio { sql.append("LEFT JOIN RUTA RT ON RT.RUTA_ID = CJ.RUTA_ID "); sql.append("LEFT JOIN SEGPOLV SX ON SX.BOLETO_ID =CJ.TRANSACAO_ID "); - sql.append("WHERE (CJ.IMPORTETAXAEMBARQUE>0 OR CJ.IMPORTEPEDAGIO>0 OR CJ.IMPORTESEGURO>0) "); + sql.append("WHERE (CJ.IMPORTETAXAEMBARQUE>0 OR CJ.IMPORTEPEDAGIO>0 OR CJ.IMPORTESEGURO>0 OR SX.VALOR>0) "); sql.append("AND CJ.INDSTATUSOPERACION = 'F' "); sql.append("AND CJ.INDREIMPRESION = 0 "); sql.append("AND DECODE(:TIPO_DATA, 1, CJ.FECHORVENTA, 2, CJ.FECCORRIDA) BETWEEN :DATA_INICIAL AND :DATA_FINAL "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2IAnalitico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2IAnalitico.java index b2bdbed52..cca32bebc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2IAnalitico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2IAnalitico.java @@ -110,14 +110,14 @@ public class RelatorioW2IAnalitico extends Relatorio { sql.append("em.nombempresa AS empresa, "); sql.append("pv.puntoventa_id AS puntoVentaId, "); sql.append("pv.nombpuntoventa As agencia, "); - sql.append("sx.boleto_id AS numBilhete, "); + sql.append("b.numfoliosistema AS numBilhete, "); sql.append("po.descparada AS origem, "); sql.append("pd.descparada AS destino, "); sql.append("b.fechorviaje dataViaje, "); sql.append("b.fechorventa dataVenda, "); sql.append("b.numasiento AS poltrona, "); sql.append("sx.valor AS valorTaxa, "); - sql.append("CASE WHEN sx.status=0 THEN 'V' ELSE 'C' END status "); + sql.append("CASE WHEN sx.status=0 THEN 'C' ELSE 'V' END status "); sql.append("FROM segpolv sx "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jasper index 41f7165b21f289e86d5bfb7d0fb0b2c82126f08b..ce49e6886c43dcf45139f2e364ac9af1d6338f89 100644 GIT binary patch delta 229 zcmZ3#jpff)mJL!alaITqOty2`JekjxZSrwF-pL%U`zK4es7!wCx_kjKZaka! zx>Yewmh%8B*zD)g#W;DtC)?&no>LeZ3pQ7KPiLI0@5{DX#&;UyzjGEO!K zVA~uV&<#@YIB+_Mst?}GIN3jxZL>}2d=URZ*isPH6|vYwlF^`$p^mk+gn`*e56o-> zF%3*BCd-*=Z!VbIrz>b=YGz;v#70K(CWhvwmd2a;Pv7zv!VoT*tSBfqT~eA+3;=ds BO^N^j delta 257 zcmeyfm1X@lmJL!alMlP9Oty2`%w5P($GD;xNHWAv7IYP!%E6>}%>O>KVa(ZnlVD7}fC(_>{y@0e@ZilbQSQ(sFy@A^ zr7&h##9|k5CQB2bGgw3yY8e19~$D5d$S(=${ WzH{o9zYvCS$z(-Ax#`cO7{vg)UsI?6 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jrxml index 79fb98080..47c01b9a4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jrxml @@ -1,8 +1,8 @@ - - + +