diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java index 16ef2148a..a973cf8c4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java @@ -1,11 +1,16 @@ package com.rjconsultores.ventaboletos.relatorios.impl; -import java.math.BigDecimal; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; import java.sql.Connection; import java.sql.ResultSet; import java.util.HashMap; import java.util.Map; +import javax.imageio.ImageIO; + import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.SegVKMService; @@ -28,6 +33,10 @@ public class RelatorioTabelaPreco extends Relatorio { NamedParameterStatement stmt = new NamedParameterStatement(conexao, getSql()); ResultSet rset = stmt.executeQuery(); + BufferedImage artespLogo= + ImageIO.read(getClass().getResource(this.relatorio.getBaseDir()+"/imagens/artesp.png")); + parametros.put("artesp_logo", artespLogo); + String series = RelatorioTabelaPreco.this.segVKMService.seriePorEmpresa((Integer) parametros.get("EMPRESA_ID")); while (rset.next()) { Map dataResult = new HashMap(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java index 5d13cdaa4..493e6d479 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java @@ -61,9 +61,7 @@ public class RenderRelatorioJasper { ResourceBundle resource = ResourceBundle.getBundle("com.rjconsultores.ventaboletos.relatorios.internacionalizacao." + this.relatorio.getNome(), locale); this.relatorio.getParametros().put(JRParameter.REPORT_RESOURCE_BUNDLE, resource); - this.relatorio.getParametros().put("BASE_DIR", getClass().getResource(this.relatorio.getBaseDir()).getPath()); - log.info("Base dir="+relatorio.getParametros().get("BASE_DIR")); - + /* Adicionar o arquivo de internacionalização para o subreporte quando informado */ if(this.relatorio.getNomeSubReporte() != null && this.relatorio.getNomeSubReporte().length > 0) { if(this.relatorio.getNomeSubReporte().length == 1 && StringUtils.isNotBlank(this.relatorio.getNomeSubReporte()[0])) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper index e06d1107b..1af1d1acf 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml index db97a41c3..4a056c25c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml @@ -1,9 +1,10 @@ - - + + + @@ -274,7 +275,7 @@ - + @@ -282,22 +283,22 @@ - + - - + + - +