From 4c8f7fa8890a77bc0cc7a4c616d8fc1cdb20abee Mon Sep 17 00:00:00 2001 From: edgar Date: Mon, 9 Jan 2017 11:18:19 +0000 Subject: [PATCH] issue #8301 - Logo Artesp git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64697 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioTabelaPreco.java | 11 ++++++++++- .../render/RenderRelatorioJasper.java | 4 +--- .../RelatorioTabelaPrecoArtesp.jasper | Bin 34326 -> 34475 bytes .../RelatorioTabelaPrecoArtesp.jrxml | 15 ++++++++------- 4 files changed, 19 insertions(+), 11 deletions(-) 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 e06d1107bcae5e19535ed10275f2ad02fe904593..1af1d1acf8f3b3d203e6340474c2b0129a61667c 100644 GIT binary patch delta 9476 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 U`{Dclb=wam;{P-5xNX#b1908J;Q#;t 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 @@ - + - - + + - +