fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
fabio 2018-04-02 19:51:05 +00:00
parent 311f54f72d
commit 9c599d9fcf
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java
View File

@ -86,7 +86,10 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
BigDecimal totalOutrasReceitas = fs.getReceitaEb().add(fs.getMultaComp()).add(fs.getDifTrocaOCD()).add(fs.getDifTarifaMaior()); BigDecimal totalOutrasReceitas = fs.getReceitaEb().add(fs.getMultaComp()).add(fs.getDifTrocaOCD()).add(fs.getDifTarifaMaior());
fs.setTotalOutrasReceitas(totalOutrasReceitas); 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.setPedagio(getBigDecimal(rset, "pedagio"));
fs.setSegFacult(getBigDecimal(rset, "segurofac")); fs.setSegFacult(getBigDecimal(rset, "segurofac"));
@ -287,7 +290,7 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
sql.append(" LEFT JOIN "); sql.append(" LEFT JOIN ");
sql.append(" (SELECT ee.empresa_id AS empresaId, "); sql.append(" (SELECT ee.empresa_id AS empresaId, ");
sql.append(" trunc(ee.fechoringreso) as fechorVenta, "); 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 = 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 = 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, "); sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id IN (41) AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS receita_multa, ");

9
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java
View File

@ -86,8 +86,11 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
BigDecimal totalOutrasReceitas = fs.getReceitaEb().add(fs.getMultaComp()).add(fs.getDifTrocaOCD()).add(fs.getDifTarifaMaior()); BigDecimal totalOutrasReceitas = fs.getReceitaEb().add(fs.getMultaComp()).add(fs.getDifTrocaOCD()).add(fs.getDifTarifaMaior());
fs.setTotalOutrasReceitas(totalOutrasReceitas); 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.setPedagio(getBigDecimal(rset, "pedagio"));
fs.setSegFacult(getBigDecimal(rset, "segurofac")); fs.setSegFacult(getBigDecimal(rset, "segurofac"));
@ -308,7 +311,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
sql.append(" (SELECT ee.empresa_id AS empresaId, "); sql.append(" (SELECT ee.empresa_id AS empresaId, ");
sql.append(" cd.puntoventa_id AS puntoventaId, "); sql.append(" cd.puntoventa_id AS puntoventaId, ");
sql.append(" eo.estado_id AS estadoId, "); 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 = 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 = 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, "); sql.append(" SUM( CASE WHEN ee.tipoeventoextra_id IN (41) AND tee.indtipo = 1 THEN cdp.importe ELSE 0 END) AS receita_multa, ");