From 1d92add41315b0a637d788fa3c817f42ce241d9d Mon Sep 17 00:00:00 2001
From: "daniel.zauli" <daniel.zauli@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 26 Oct 2015 12:59:19 +0000
Subject: [PATCH] FIXES BUG #6768

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
index 9cd86f249..edcbd2e66 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
@@ -66,7 +66,9 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
 		sql.append("         inner join tramo tra on tra.tramo_id = rseq.TRAMO_ID  and rseq.ruta_id = :rutaId ");
 		sql.append("         inner join caseta_peaje casp on casp.casetapeaje_id = rcas.casetapeaje_id ");
 		sql.append(" )  ");
-		sql.append(" select distinct * from myTable my inner join caseta_tramo_da_ruta ctr on ctr.numSecuencia2 between  my.origen_tramo_inicial_seq and my.destino_tramo_final_seq order by tracomb ");
+		sql.append(" select distinct ");
+		sql.append(" origen_tramo_inicial_seq, destino_tramo_final_seq, ttramo, tt2tramo, traComb, ttorig, ttdest, traCombdesc, traComborig, traCombdest, tracombvia, tracombcantkm, tracombcantkmpago, tracombactivo, tracombfecmodif, tracombusuario, rutacasetaid, rutasecuenciaId, casetaPeaje_Id, tramoid, casetaPeajeid, desccaseta, importeida, importevuelta, caspActivo, caspfecmodif, caspusuario ");
+		sql.append("  from myTable my inner join caseta_tramo_da_ruta ctr on ctr.numSecuencia between  my.origen_tramo_inicial_seq and my.destino_tramo_final_seq order by tracomb ");
 		
 		
 		Query query = getSession().createSQLQuery(sql.toString());
@@ -108,13 +110,13 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
 							pvo.setOrigenId(Integer.parseInt(""+o[8]));
 							pvo.setDestinoId(Integer.parseInt(""+o[9]));
 							pvo.setOrgaoId(orgao.getOrgaoConcedenteId());
-							pvo.setCasetaPeajeId(Integer.parseInt(""+o[22]));
+							pvo.setCasetaPeajeId(Integer.parseInt(""+o[20]));//
 							pvo.setCantAsientos(r.getCantAsientos());
 							pvo.setCantEixos(r.getCantEixos());
 							if(r.getIndSentidoIda()){
-								pvo.setImportePeaje(BigDecimal.valueOf(Double.parseDouble(""+o[24])));
+								pvo.setImportePeaje(BigDecimal.valueOf(Double.parseDouble(""+o[22])));//
 							}else{
-								pvo.setImportePeaje(BigDecimal.valueOf(Double.parseDouble(""+o[25])));
+								pvo.setImportePeaje(BigDecimal.valueOf(Double.parseDouble(""+o[23])));//
 							}
 							pvo.setIndicePeaje(orgao.getIndicePeaje());
 							pvo.setActivo(1);