diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java index 81f98a013..672d83fb5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java @@ -290,6 +290,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO= :dtIni "); sb.append(" AND COR.FECCORRIDA <= :dtFim "); + sb.append(" AND cor.tiposervicio_id = 2 "); sb.append(" AND OPE.ACTIVO = 1 "); sb.append(" ORDER BY "); sb.append(" COR.FECHORSALIDA, "); @@ -311,7 +312,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO obterListaTramo( String chave ) throws Exception{ + private List obterListaTramo( String chave, Integer rutaId ) throws Exception{ StringBuilder sb = new StringBuilder(); sb.append(" SELECT"); - sb.append(" CT.TRAMO_ID "); - sb.append(" FROM CORRIDA C"); - sb.append(" JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = C.CORRIDA_ID AND CT.FECCORRIDA = C.FECCORRIDA"); - sb.append(" WHERE C.CORRIDA_ID = :corridaId AND C.FECCORRIDA = :feccorrida and CT.activo = 1 "); + sb.append(" TRM.TRAMO_ID "); + sb.append(" FROM RUTA_COMBINACION RC "); + sb.append(" JOIN TRAMO TRM ON TRM.TRAMO_ID = RC.TRAMO_ID AND TRM.activo = 1 "); + sb.append(" JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = :corridaId "); + sb.append(" AND CT.FECCORRIDA = :feccorrida "); + sb.append(" AND CT.DESTINO_ID = TRM.DESTINO_ID "); + sb.append(" AND CT.activo = 1 "); + sb.append(" WHERE RC.RUTA_ID = :rutaId "); + sb.append(" AND RC.activo = 1 "); sb.append(" ORDER BY CT.NUMSECUENCIA "); Query query = getSession().createSQLQuery(sb.toString()).addScalar("TRAMO_ID", IntegerType.INSTANCE); @@ -343,6 +349,7 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO sql.append(" AND ( sysdate BETWEEN vt.feciniciovigencia AND vt.fecfinvigencia "); sql.append(" AND vt.activo = 1 ) "); sql.append(" and trm.tramo_id in ( :tramoIds ) "); + sql.append(" ORDER BY crt.numsecuencia "); Query query = getSession().createSQLQuery(sql.toString()) .addScalar("tramoId", IntegerType.INSTANCE) diff --git a/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcada.java b/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcada.java index 5e46bebe1..d75c2d4a7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcada.java +++ b/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcada.java @@ -42,12 +42,12 @@ public class OperadorEmbarcada implements Serializable { @JoinColumn(name = "USUARIO_ID") private Usuario usuario; - @OneToMany(mappedBy = "operadorEmbarcada", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @OneToMany(mappedBy = "operadorEmbarcada", cascade = CascadeType.ALL, fetch = FetchType.LAZY) @Fetch(FetchMode.SELECT) @Where(clause="activo=1") private List linhas; - @OneToMany(mappedBy = "operadorEmbarcada", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @OneToMany(mappedBy = "operadorEmbarcada", cascade = CascadeType.ALL, fetch = FetchType.LAZY) @Fetch(FetchMode.SELECT) @Where(clause="activo=1") private List servicos; diff --git a/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaServico.java b/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaServico.java index 19ae14282..efea14a55 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaServico.java +++ b/src/com/rjconsultores/ventaboletos/entidad/OperadorEmbarcadaServico.java @@ -32,7 +32,7 @@ public class OperadorEmbarcadaServico implements Serializable { @JoinColumn(name = "OPERADOR_EMBARCADA_ID", referencedColumnName = "OPERADOR_EMBARCADA_ID") private OperadorEmbarcada operadorEmbarcada; - @OneToOne(fetch = FetchType.EAGER) + @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "ESQUEMA_CORRIDA_ID") private EsquemaCorrida corrida;