From d796c6bbbeb64a945d2fb8f1989f20bcbec5f45f Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 13 May 2019 23:58:57 +0000
Subject: [PATCH] =?UTF-8?q?14328:=20Acrescentar=20campo=20esta=C3=A7=C3=A3?=
 =?UTF-8?q?o=5Fid=20no=20dispositivo=20embarcada.=20fixes=20bug#14328=20de?=
 =?UTF-8?q?v:valdevir=20qua:leo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
index 023e295c0..eccd4736e 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
@@ -61,8 +61,8 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
 		sb.append(" INNER JOIN ROL_OPERATIVO ROL ON COR.ROLOPERATIVO_ID = ROL.ROLOPERATIVO_ID ");
 		sb.append(" INNER JOIN CORRIDA_TRAMO CRT ON CRT.CORRIDA_ID = COR.CORRIDA_ID AND CRT.FECCORRIDA = COR.FECCORRIDA ");
 		sb.append(" INNER JOIN TRAMO TRM ON TRM.TRAMO_ID = CRT.TRAMO_ID ");
-		sb.append(" INNER JOIN TARIFA ta.tramo.tramoId = TRM.TRAMO_ID ");
-		sb.append(" inner join VIGENCIA_TARIFA VT on VT.VIGENCIATARIFA_ID = a.VIGENCIATARIFA_ID ");
+		sb.append(" INNER JOIN TARIFA ta on ta.tramo_Id = TRM.TRAMO_ID ");
+		sb.append(" inner join VIGENCIA_TARIFA VT on VT.VIGENCIATARIFA_ID = ta.VIGENCIATARIFA_ID ");
 		sb.append(" INNER JOIN PARADA ORI ON ORI.PARADA_ID = TRM.ORIGEN_ID ");
 		sb.append(" INNER JOIN CIUDAD ORICID ON ORICID.CIUDAD_ID = ORI.CIUDAD_ID ");
 		sb.append(" INNER JOIN ESTADO ORIEST ON ORIEST.ESTADO_ID = ORICID.ESTADO_ID ");
@@ -73,13 +73,13 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
 		sb.append("  WHERE ");
 		sb.append("  OPE.USUARIO_ID = :usuario_id AND ");
 		sb.append("  COR.EMPRESACORRIDA_ID = :empresa AND ");
-		sb.append("  COR.FECCORRIDA >= :dtIni AND ");
-		sb.append("  and (sysdate between VT.FECINICIOVIGENCIA and VT.FECFINVIGENCIA and vt.activo = 1) ");
-		sb.append("  COR.FECCORRIDA <= :dtFim ");
+		sb.append("  COR.FECCORRIDA >= :dtIni AND COR.FECCORRIDA <= :dtFim ");
+		sb.append("  AND (sysdate between VT.FECINICIOVIGENCIA and VT.FECFINVIGENCIA and vt.activo = 1) ");
 		sb.append("  AND OPS.activo = 1 AND OPE.activo = 1 AND ESQ.activo = 1 AND COR.activo = 1 AND TPS.activo = 1 AND ROL.activo = 1 AND CRT.activo = 1 AND TRM.activo = 1 AND ORI.activo = 1 AND DES.activo = 1 AND VIA.activo = 1");
 		sb.append("  GROUP BY ");
 		sb.append("  COR.CORRIDA_ID, ESQ.NUMCORRIDA, COR.FECHORSALIDA, COR.TIPOSERVICIO_ID, TPS.DESCSERVICIO, ROL.ROLOPERATIVO_ID, ROL.DESCROLOPERATIVO, TRM.TRAMO_ID, TRM.DESCTRAMO, TRM.ORIGEN_ID, ORI.DESCPARADA, TRM.DESTINO_ID, DES.DESCPARADA, TRM.VIA_ID, VIA.NOMBVIA, CRT.NUMSECUENCIA, ");
-		sb.append(" ORIEST.ESTADO_ID, ORIEST.NOMBESTADO, DESEST.ESTADO_ID, DESEST.NOMBESTADO, ORICID.CIUDAD_ID, ORICID.NOMBCIUDAD, DESCID.CIUDAD_ID, DESCID.NOMBCIUDAD, ORIEST.CVEESTADO, DESEST.CVEESTADO, COR.RUTA_ID ");
+		sb.append(" ORIEST.ESTADO_ID, ORIEST.NOMBESTADO, DESEST.ESTADO_ID, DESEST.NOMBESTADO, ORICID.CIUDAD_ID, ORICID.NOMBCIUDAD, DESCID.CIUDAD_ID, DESCID.NOMBCIUDAD, ORIEST.CVEESTADO, DESEST.CVEESTADO, COR.RUTA_ID, ");
+		sb.append(" ta.IMPORTETAXAEMBARQUE, ta.IMPORTEPEDAGIO, ta.IMPORTEOUTROS, ta.IMPORTESEGURO, ta.precio ");
 		sb.append("  ORDER BY ");
 		sb.append("  COR.FECHORSALIDA, COR.CORRIDA_ID, TRM.TRAMO_ID, TRM.DESCTRAMO, CRT.NUMSECUENCIA ");