From 9c599d9fcfba4ad58c55edcc029fc9c746128268 Mon Sep 17 00:00:00 2001 From: fabio Date: Mon, 2 Apr 2018 19:51:05 +0000 Subject: [PATCH] bug#10773 dev: Gleimar qua: Gleimar git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@80464 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioFinanceiroAnalitico.java | 7 +++++-- .../relatorios/impl/RelatorioFinanceiroSintetico.java | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java index 11c54c711..fdfb41684 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java @@ -86,7 +86,10 @@ public class RelatorioFinanceiroAnalitico extends Relatorio { BigDecimal totalOutrasReceitas = fs.getReceitaEb().add(fs.getMultaComp()).add(fs.getDifTrocaOCD()).add(fs.getDifTarifaMaior()); fs.setTotalOutrasReceitas(totalOutrasReceitas); - fs.setTxEmb(getBigDecimal(rset, "taxaEmbarque")); + BigDecimal taxaEmbarque = getBigDecimal(rset, "taxaEmbarque"); + taxaEmbarque = taxaEmbarque.add(getBigDecimal(rset, "taxaEmbarque_ee")); + fs.setTxEmb(taxaEmbarque); + fs.setPedagio(getBigDecimal(rset, "pedagio")); fs.setSegFacult(getBigDecimal(rset, "segurofac")); @@ -287,7 +290,7 @@ public class RelatorioFinanceiroAnalitico extends Relatorio { sql.append(" LEFT JOIN "); sql.append(" (SELECT ee.empresa_id AS empresaId, "); sql.append(" trunc(ee.fechoringreso) as fechorVenta, "); - sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id = 2 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS taxaembarque, "); + sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id = 2 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS taxaembarque_ee, "); sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id = 25 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS segurofac, "); sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id = 82 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS receita_eb, "); sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id IN (41) AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS receita_multa, "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java index 08ed4b661..c70dd5705 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java @@ -86,8 +86,11 @@ public class RelatorioFinanceiroSintetico extends Relatorio { BigDecimal totalOutrasReceitas = fs.getReceitaEb().add(fs.getMultaComp()).add(fs.getDifTrocaOCD()).add(fs.getDifTarifaMaior()); fs.setTotalOutrasReceitas(totalOutrasReceitas); - - fs.setTxEmb(getBigDecimal(rset, "taxaEmbarque")); + + BigDecimal taxaEmbarque = getBigDecimal(rset, "taxaEmbarque"); + taxaEmbarque = taxaEmbarque.add(getBigDecimal(rset, "taxaEmbarque_ee")); + fs.setTxEmb(taxaEmbarque); + fs.setPedagio(getBigDecimal(rset, "pedagio")); fs.setSegFacult(getBigDecimal(rset, "segurofac")); @@ -308,7 +311,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio { sql.append(" (SELECT ee.empresa_id AS empresaId, "); sql.append(" cd.puntoventa_id AS puntoventaId, "); sql.append(" eo.estado_id AS estadoId, "); - sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id = 2 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS taxaembarque, "); + sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id = 2 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS taxaembarque_ee, "); sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id = 25 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS segurofac, "); sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id = 82 AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS receita_eb, "); sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id IN (41) AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS receita_multa, ");