From 1cea07df17b0ebf267578e094be7778ee65c5f86 Mon Sep 17 00:00:00 2001
From: fabio <fabio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 23 Oct 2020 20:06:35 +0000
Subject: [PATCH] bug#20497 dev: Valvevir qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@103925 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/AliasServicoHibernateDAO.java             | 1 +
 .../ventaboletos/dao/hibernate/CorridaHibernateDAO.java     | 1 +
 .../dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java
index 4361d9408..9e869c65e 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java
@@ -20,6 +20,7 @@ import com.rjconsultores.ventaboletos.entidad.Parada;
 import com.rjconsultores.ventaboletos.entidad.Ruta;
 
 @Repository("aliasServicoDAO")
+@SuppressWarnings("unchecked")
 public class AliasServicoHibernateDAO extends GenericHibernateDAO<AliasServico, Integer>
 		implements AliasServicoDAO {
 
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java
index a66404cb6..3a1100692 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java
@@ -933,6 +933,7 @@ public class CorridaHibernateDAO extends GenericHibernateDAO<Corrida, Corrida.Id
 			co.setMarcaId( corrida.getMarca().getMarcaId().intValue() );
 			co.setClaseServicioId( corrida.getClaseServicio().getClaseservicioId());
 			co.setEmpresaId( corrida.getEmpresa().getEmpresaId());
+			co.setRutaId( corrida.getRuta().getRutaId() );
 			
 			preencherTramoSequencia(co, corrida);
 			
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
index bba2d4b6b..f086cc2dc 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
@@ -266,7 +266,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
 		StringBuilder sb = new StringBuilder();
 
 		sb.append("select * from (SELECT");
-		sb.append(" 	cor.corrida_id ||';'|| to_char(cor.feccorrida, 'ddMMYYYY') AS chave ");		
+		sb.append(" 	cor.corrida_id ||';'|| to_char(cor.feccorrida, 'ddMMYYYY') AS chaveCorrida ");		
 		sb.append(" FROM OPERADOR_EMBARCADA OPE ");
 		sb.append(" JOIN OPERADOR_EMBARCADA_SERVICO OPS ON OPE.OPERADOR_EMBARCADA_ID = OPS.OPERADOR_EMBARCADA_ID AND OPS.ACTIVO = 1 ");
 		sb.append(" JOIN ESQUEMA_CORRIDA ESQ ON ESQ.ESQUEMACORRIDA_ID = OPS.ESQUEMA_CORRIDA_ID AND ESQ.ACTIVO = 1 ");
@@ -280,7 +280,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
 		sb.append(" 	COR.FECHORSALIDA, ");
 		sb.append(" 	COR.CORRIDA_ID) ");
 		sb.append(" UNION select * from (SELECT ");
-		sb.append("  	cor.corrida_id ||';'|| to_char(cor.feccorrida, 'ddMMYYYY') AS chave ");
+		sb.append("  	cor.corrida_id ||';'|| to_char(cor.feccorrida, 'ddMMYYYY') AS chaveCorrida ");
  		sb.append(" FROM OPERADOR_EMBARCADA OPE ");
  		sb.append(" JOIN OPERADOR_EMBARCADA_LINHA OPL ON OPE.OPERADOR_EMBARCADA_ID = OPL.OPERADOR_EMBARCADA_ID AND OPL.ACTIVO = 1 ");
  		sb.append("  left join operador_embarcada_servico ops on ops.operador_embarcada_id = ope.operador_embarcada_id AND ops.operador_embarcada_servico_id is null ");
@@ -307,7 +307,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
 			List<CorridaVO> corridas = new ArrayList<CorridaVO>(); 
 			for (String chave : list) {
 				CorridaVO co = new CorridaVO();
-				co.setChave(chave);
+				co.setChaveCorrida(chave);
 				co.setListTramos( obterListaTramo(chave) );
 				corridas.add(co);
 			}