From b2dd5a4b9875e8096538ee1b72b0c18dc8ff14e8 Mon Sep 17 00:00:00 2001
From: changelogweb <changelogweb@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 26 Feb 2021 16:02:11 +0000
Subject: [PATCH] fixes bug#21720

dev:aristides
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@105557 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/TramoHibernateDAO.java      |  5 ++-
 .../ventaboletos/vo/tramo/TramoVO.java        | 36 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java
index 02d295414..28025738d 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java
@@ -214,7 +214,8 @@ public class TramoHibernateDAO extends GenericHibernateDAO<Tramo, Integer>
 		sql.append("     coalesce(ta.importeoutros, 0)         AS valorOutros, ");
 		sql.append("     coalesce(ta.importeseguro, 0)         AS valorSeguro, ");
 		sql.append("     coalesce(ta.precio, 0)                AS valorTarifa, ");
-		sql.append("     0                                     AS tarifaMinima ");
+		sql.append("     0                                     AS tarifaMinima, ");
+		sql.append("     emp.empresa_id                        AS empresaId ");
 		sql.append(" FROM ");
 		sql.append("     ruta_combinacion   rc ");
 		sql.append("     JOIN tramo trm ON trm.tramo_id = rc.tramo_id AND trm.activo = 1  ");
@@ -270,6 +271,8 @@ public class TramoHibernateDAO extends GenericHibernateDAO<Tramo, Integer>
 			.addScalar("valorSeguro", BigDecimalType.INSTANCE)
 			.addScalar("valorTarifa", BigDecimalType.INSTANCE)
 			.addScalar("tarifaMinima", BigDecimalType.INSTANCE)
+			.addScalar("empresaId", IntegerType.INSTANCE)
+			
 			.setResultTransformer(Transformers.aliasToBean(TramoVO.class));
 		
 		String[] split = chaveCorrida.split(";");
diff --git a/src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java b/src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java
index a30104a7a..e11aa30d5 100644
--- a/src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java
+++ b/src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java
@@ -3,6 +3,8 @@ package com.rjconsultores.ventaboletos.vo.tramo;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+import org.hibernate.type.IntegerType;
+
 import com.rjconsultores.ventaboletos.entidad.Tramo;
 import com.rjconsultores.ventaboletos.vo.parada.ParadaVO;
 import com.rjconsultores.ventaboletos.vo.via.ViaVO;
@@ -30,6 +32,7 @@ public class TramoVO implements Serializable{
 	private Integer destinoId;
 	private Integer rutaId;
 	private Integer monedaId;
+	private Integer empresaId;
 
 	public TramoVO() {
 		//construtor default
@@ -57,6 +60,31 @@ public class TramoVO implements Serializable{
 		this.valorOutros = valorOutros;
 	}
 	
+	public TramoVO(Integer tramoId, String desctramo, ParadaVO origem, ParadaVO destino, ViaVO via, Integer numsecuencia, BigDecimal valorTarifa, BigDecimal valorTaxa, BigDecimal valorSeguro, BigDecimal valorPedagio, BigDecimal valorOutros, BigDecimal tarifaMinima, Integer aliasorigenId, Integer aliasdestinoId, String descAliasorigen, String descAliasdestino, Integer origemId, Integer destinoId, Integer rutaId, Integer monedaId, Integer empresaId) {
+		super();
+		this.tramoId = tramoId;
+		this.desctramo = desctramo;
+		this.origem = origem;
+		this.destino = destino;
+		this.via = via;
+		this.numsecuencia = numsecuencia;
+		this.valorTarifa = valorTarifa;
+		this.valorTaxa = valorTaxa;
+		this.valorSeguro = valorSeguro;
+		this.valorPedagio = valorPedagio;
+		this.valorOutros = valorOutros;
+		this.tarifaMinima = tarifaMinima;
+		this.aliasorigenId = aliasorigenId;
+		this.aliasdestinoId = aliasdestinoId;
+		this.descAliasorigen = descAliasorigen;
+		this.descAliasdestino = descAliasdestino;
+		this.origemId = origemId;
+		this.destinoId = destinoId;
+		this.rutaId = rutaId;
+		this.monedaId = monedaId;
+		this.empresaId = empresaId;
+	}
+
 	public TramoVO( Tramo tramo ) {
 		super();
 		this.tramoId = tramo.getTramoId();
@@ -226,4 +254,12 @@ public class TramoVO implements Serializable{
 		this.monedaId = monedaId;
 	}
 
+	public Integer getEmpresaId() {
+		return empresaId;
+	}
+
+	public void setEmpresaId(Integer empresaId) {
+		this.empresaId = empresaId;
+	}
+
 }