From ae9bb06806b412d29bdf5206d2e8037745261f3b Mon Sep 17 00:00:00 2001
From: "daniel.zauli" <daniel.zauli@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 9 Dec 2016 18:32:51 +0000
Subject: [PATCH] fixes bug #8353

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@63378 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/CalcularPeajeHibernateDAO.java         | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
index 3d13bac48..aad3de745 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
@@ -85,7 +85,7 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
 				.append("    inner join ruta r on r.ruta_id = rcom.ruta_id ")
 				.append("    inner join orgao_concedente oc on oc.orgaoconcedente_id = r.orgaoconcedente_id ")
 				.append("    inner join tramo t on t.tramo_id = rcom.tramo_id ")
-				.append("  where r.ruta_id = :rutaId ")
+				.append("  where r.ruta_id = :rutaId  and rcom.activo =1 and r.activo=1 and oc.activo =1 and t.activo = 1 ")
 				.append("), mytable as ( ")
 				.append("  select eiorig.icms as icms, ")
 				.append("    rseqorig.numsecuencia as origen_tramo_inicial_seq, rseqdest.numsecuencia as destino_tramo_final_seq, ")
@@ -105,6 +105,7 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
 				.append("    inner join estado eorig on eorig.estado_id = corig.estado_id ")
 				.append("    inner join empresa_imposto eiorig on eiorig.empresa_id = e.empresa_id and eiorig.estado_id = eorig.estado_id ")
 				.append("    inner join tramo_tmp tt on torig.origen_id = tt.orig and tdest.destino_id = tt.dest ")
+				.append("    where  rseqorig.activo = 1 and torig.activo = 1 and rseqdest.activo = 1 and tdest.activo = 1 and re.activo = 1 and  e.activo = 1 and porig.activo = 1 and corig.activo = 1 and eorig.activo = 1  ")
 				.append("), caseta_tramo_da_ruta as ( ")
 				.append("  select rcas.rutacaseta_id as rutacasetaid, rcas.rutasecuencia_id as rutasecuenciaid, rcas.casetapeaje_id, ")
 				.append("    rseq1.numsecuencia as numsecuencia, rseq1.tramo_id as tramoid, rseq2.numsecuencia as numsecuencia2, ")
@@ -116,6 +117,7 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
 				.append("    inner join ruta_secuencia rseq2 on rseq2.tramo_id = rseq1.tramo_id ")
 				.append("    inner join tramo tra on tra.tramo_id = rseq1.tramo_id and rseq1.ruta_id = :rutaId ")
 				.append("    inner join caseta_peaje casp on casp.casetapeaje_id = rcas.casetapeaje_id ")
+				.append("    where rcas.activo =1 and  rseq1.activo =1 and   rseq2.activo =1 and  tra.activo =1 and casp.activo =1  ")
 				.append(") ")
 				.append("select distinct origen_tramo_inicial_seq, destino_tramo_final_seq, tramo_orig, tramo_dest, tracomb, ttorig, ttdest, ")
 				.append("  tracombdesc, tracomborig, tracombdest, tracombvia, tracombcantkm, tracombcantkmpago, tracombactivo, ")
@@ -143,10 +145,7 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
 			List<Object> lsObj = buscarCasetasPeajeWithinTramo(ruta);
 			if (null != lsObj) {
 				for (Object arrObj : lsObj) {
-					Integer origenId = Integer.parseInt(((Object[]) arrObj)[8].toString());
-					Integer destinoId = Integer.parseInt(((Object[]) arrObj)[9].toString());
-					RutaCombinacion rcom = rutaCombinacionService.busquedaTramoRutaOrigemDestino(ruta.getRutaId(), origenId, destinoId);
-					BigDecimal bigKm = rcom.getTramo().getKmReal();
+					BigDecimal bigKm = new BigDecimal(((Object[]) arrObj)[11].toString()) ;
 					peajes.add(PeajeVO.create(ruta, orgao, (Object[]) arrObj, classeIndicePeajes, usaICMS, bigKm));
 				}
 			}