From 9d3663627dc11038669949ffea736eebddb83576 Mon Sep 17 00:00:00 2001
From: edgar <edgar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 9 Jan 2017 18:27:09 +0000
Subject: [PATCH] issue #8301 - Logo Empresa

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64723 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioTabelaPreco.java |  33 ++++++++++++------
 .../RelatorioTabelaPrecoArtesp.jasper         | Bin 34475 -> 35120 bytes
 .../RelatorioTabelaPrecoArtesp.jrxml          |  18 ++++++----
 .../RelatorioTabelaPrecoController.java       |   7 ++--
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java
index a973cf8c4..d6425dbbf 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java
@@ -1,9 +1,8 @@
 package com.rjconsultores.ventaboletos.relatorios.impl;
 
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.util.HashMap;
@@ -11,6 +10,7 @@ import java.util.Map;
 
 import javax.imageio.ImageIO;
 
+import com.rjconsultores.ventaboletos.entidad.Marca;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.SegVKMService;
@@ -32,27 +32,25 @@ public class RelatorioTabelaPreco extends Relatorio {
 				Connection conexao = this.relatorio.getConexao();
 				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);
+				
+				setReportImages();
 				
 				String series = RelatorioTabelaPreco.this.segVKMService.seriePorEmpresa((Integer) parametros.get("EMPRESA_ID"));
 				while (rset.next()) {
 					Map<String, Object> dataResult = new HashMap<String, Object>();
-					
+
 					if (isLayoutArtesp) {
 						dataResult.put("seguroOpcional",
 								RelatorioTabelaPreco.this.segVKMService.buscarSeguroPorKm(rset.getLong("kmReal"),
-								series, (Integer) parametros.get("ORGAO_CONCEDENTE_ID")));
+										series, (Integer) parametros.get("ORGAO_CONCEDENTE_ID")));
 					}
-					
+
 					dataResult.put("origem", rset.getString("origem"));
 					dataResult.put("destino", rset.getString("destino"));
 					dataResult.put("tarifa", rset.getBigDecimal("tarifa"));
 					dataResult.put("pedagio", rset.getBigDecimal("pedagio"));
 					dataResult.put("taxaEmbarque", rset.getBigDecimal("taxaEmbarque"));
-					
+
 					dataResult.put("outros", rset.getBigDecimal("outros"));
 					dataResult.put("tipoClasse", rset.getString("tipoClasse"));
 					dataResult.put("empresa", rset.getString("empresa"));
@@ -73,6 +71,19 @@ public class RelatorioTabelaPreco extends Relatorio {
 		});
 	}
 
+	protected void setReportImages() throws IOException {
+		BufferedImage empresaLogo = null;
+		Marca marca = (Marca) parametros.get("MARCA");
+		if (marca != null && marca.getLogotipomarca() != null) {
+			empresaLogo = ImageIO.read(new ByteArrayInputStream(marca.getLogotipomarca()));
+		}
+		BufferedImage artespLogo = ImageIO.read(getClass().getResource(getBaseDir() + "/imagens/artesp.png"));
+
+		parametros.put("artesp_logo", artespLogo);
+		parametros.put("empresa_logo", empresaLogo);
+		
+	}
+
 	@Override
 	protected void processaParametros() throws Exception {
 	}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper
index 1af1d1acf8f3b3d203e6340474c2b0129a61667c..483ba40ec5930503f547018dc4c8a9c88d653964 100644
GIT binary patch
delta 4569
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

delta 4201
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
BN&^4@

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml
index 4a056c25c..9265ecbd5 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioTabelaPreco" pageWidth="900" pageHeight="842" orientation="Landscape" columnWidth="860" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="5edc9f7a-8634-485f-96f7-c65a462aa868">
 	<property name="ireport.zoom" value="1.000000000000004"/>
-	<property name="ireport.x" value="38"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
-	<parameter name="BASE_DIR" class="java.lang.String"/>
 	<parameter name="artesp_logo" class="java.lang.Object"/>
+	<parameter name="empresa_logo" class="java.lang.Object"/>
 	<field name="origem" class="java.lang.String"/>
 	<field name="destino" class="java.lang.String"/>
 	<field name="tarifa" class="java.math.BigDecimal"/>
@@ -35,22 +35,28 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="36" splitType="Stretch">
+		<band height="47" splitType="Stretch">
 			<textField>
-				<reportElement uuid="5d83d8a8-01aa-4022-9583-6808e65d2ec8" mode="Opaque" x="0" y="0" width="321" height="33" backcolor="#FFFF66"/>
+				<reportElement uuid="5d83d8a8-01aa-4022-9583-6808e65d2ec8" mode="Opaque" x="0" y="0" width="321" height="47" backcolor="#FFFF66"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="20" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="2c5b01a1-51db-478a-a307-83c9df5cea6e" x="321" y="0" width="539" height="33"/>
-				<textElement verticalAlignment="Middle">
+				<reportElement uuid="2c5b01a1-51db-478a-a307-83c9df5cea6e" x="363" y="0" width="497" height="47">
+					<printWhenExpression><![CDATA[($P{empresa_logo})==null]]></printWhenExpression>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="14" isBold="true"/>
 					<paragraph leftIndent="4"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 			</textField>
+			<image onErrorType="Blank">
+				<reportElement uuid="71c314ae-5bbd-41d2-a548-b80de625c9b0" x="363" y="0" width="497" height="47"/>
+				<imageExpression><![CDATA[$P{empresa_logo}]]></imageExpression>
+			</image>
 		</band>
 	</title>
 	<pageHeader>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java
index 764b89a75..91c1980e9 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java
@@ -1,6 +1,5 @@
 package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -18,7 +17,6 @@ import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Comboitem;
-import org.zkoss.zul.ListModelArray;
 import org.zkoss.zul.ListModelList;
 import org.zkoss.zul.Paging;
 
@@ -30,10 +28,10 @@ import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioTabelaPreco;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
+import com.rjconsultores.ventaboletos.service.MarcaService;
 import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService;
 import com.rjconsultores.ventaboletos.service.ParadaService;
 import com.rjconsultores.ventaboletos.service.SegVKMService;
-import com.rjconsultores.ventaboletos.service.TramoService;
 import com.rjconsultores.ventaboletos.service.VigenciaTarifaService;
 import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
@@ -77,6 +75,8 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer {
 	private DataSource dataSourceRead;
 	@Autowired
 	private SegVKMService segVKMService;
+	@Autowired
+	private MarcaService marcaService;
 
 	private List<Parada> destinoList;
 	private List<VigenciaTarifa> lsVigencia;
@@ -118,6 +118,7 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer {
 			Empresa empresa = (Empresa) itemEmpresa.getValue();
 			parametros.put("EMPRESA_ID", empresa.getEmpresaId());
 			parametros.put("EMPRESA", empresa.getNombempresa());
+			parametros.put("MARCA",marcaService.buscarMarcaPorEmpresa(Arrays.asList(empresa)).get(0));
 		}
 
 		if (cmbOrgaoConcedente.getSelectedItem() != null) {