diff --git a/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java b/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java index 6fc43e29a..a0b8356a0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java @@ -60,6 +60,8 @@ public interface RutaDAO extends GenericDAO { public List buscaRuta(String palavraPesquisaRuta, OrgaoConcedente orgao); public List buscaRutasFromOrgao(OrgaoConcedente orgao); + + public List buscaSomenteRutasFromOrgao(OrgaoConcedente orgao); public List buscarPorRutaPorEmpresas(List lsEmpresas); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java index d1f050428..0a2eb6858 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java @@ -239,12 +239,26 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme return qry.list(); } - public List buscaRutasFromOrgao(OrgaoConcedente orgao) { + public List buscaRutasFromOrgao(OrgaoConcedente orgao) { // busca rutas e pedágios StringBuffer hql = new StringBuffer(); hql.append("select distinct r FROM Ruta r inner join r.rutaSecuenciaList rSeqList "); hql.append(" inner join rSeqList.lsRutaCase casRutaList "); hql.append(" WHERE r.orgaoConcedente.orgaoConcedenteId = :orgaoId and r.activo = 1 and r.indRutaCancelada = 0 "); + hql.append(" order by r.descruta "); + + Query sq = getSession().createQuery(hql.toString()); + sq.setParameter("orgaoId", orgao.getOrgaoConcedenteId()); + List lsRuta = sq.list(); + return lsRuta; + } + + public List buscaSomenteRutasFromOrgao(OrgaoConcedente orgao) { + StringBuffer hql = new StringBuffer(); + hql.append("select distinct r FROM Ruta r "); + hql.append(" WHERE r.orgaoConcedente.orgaoConcedenteId = :orgaoId and r.activo = 1 and r.indRutaCancelada = 0 "); + hql.append(" order by r.descruta "); + Query sq = getSession().createQuery(hql.toString()); sq.setParameter("orgaoId", orgao.getOrgaoConcedenteId()); diff --git a/src/com/rjconsultores/ventaboletos/service/RutaService.java b/src/com/rjconsultores/ventaboletos/service/RutaService.java index 33512967e..17dbe9997 100644 --- a/src/com/rjconsultores/ventaboletos/service/RutaService.java +++ b/src/com/rjconsultores/ventaboletos/service/RutaService.java @@ -91,6 +91,7 @@ public interface RutaService { public List buscaRuta(String palavraPesquisaRuta, OrgaoConcedente orgao); public List buscaRutasFromOrgao(OrgaoConcedente orgao); + public List buscaSomenteRutasFromOrgao(OrgaoConcedente orgao); public List buscarTodosEstos(Integer[] idRutas); diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java index 0a2d0c74d..e5799cfbd 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java @@ -514,6 +514,10 @@ public class RutaServiceImpl implements RutaService { public List buscaRutasFromOrgao(OrgaoConcedente orgao) { return rutaDAO.buscaRutasFromOrgao(orgao); } + + public List buscaSomenteRutasFromOrgao(OrgaoConcedente orgao) { + return rutaDAO.buscaSomenteRutasFromOrgao(orgao); + } @Override public List buscarRutasPorEmpresas(List lsEmp) {