diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java index 5d8233c04..221e2a102 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java @@ -67,6 +67,7 @@ public class RelatorioReceitaServico extends Relatorio { dataResult.put("origem", rset.getString("origem")); dataResult.put("destino", rset.getString("destino")); dataResult.put("classe", rset.getString("classe")); + dataResult.put("preciobase", rset.getBigDecimal("preciobase")); dataResult.put("tarifa", rset.getBigDecimal("tarifa")); dataResult.put("tut", rset.getBigDecimal("tut")); dataResult.put("pedagio", rset.getBigDecimal("pedagio")); @@ -98,6 +99,7 @@ public class RelatorioReceitaServico extends Relatorio { sql.append(" pOrig.cveparada as Origem, "); sql.append(" pDest.cveparada as Destino, "); sql.append(" cl_ser.descclase as Classe, "); + sql.append(" cj.preciobase as preciobase, "); sql.append(" cj.preciopagado as tarifa, "); sql.append(" cj.importetaxaembarque as tut, "); sql.append(" cj.importepedagio as pedagio, "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper index 85db6e241..e00ce1836 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml index dc4f69b09..d815b7402 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml @@ -1,8 +1,10 @@ - + + + @@ -26,6 +28,7 @@ + @@ -140,229 +143,264 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + +