From 15ee106eb4bf21fc57867be8dc610e9a5f27352b Mon Sep 17 00:00:00 2001
From: edgar <edgar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 5 Aug 2016 13:07:38 +0000
Subject: [PATCH] fixes bug #7460 - cancelar retomar ruta

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java
index 23465617a..38c16a0aa 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java
@@ -59,15 +59,15 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
 	@Override
 	public List<Ruta> buscarPorRutaPorEmpresas(List<Empresa> lsEmpresas) {
 		Criteria c = getSession().createCriteria(getPersistentClass());
-		
+
 		c.add(Restrictions.eq("activo", Boolean.TRUE));
-		
+		c.add(Restrictions.eq("indRutaCancelada", false));
 		Criteria cEmpresa = c.createCriteria("lsRutaEmpresa");
 		cEmpresa.add(Restrictions.in("empresa", lsEmpresas));
 		cEmpresa.add(Restrictions.eq("activo", Boolean.TRUE));
-		
+
 		c.addOrder(Order.asc("descruta"));
-		
+
 		return c.list();
 	}
 
@@ -81,7 +81,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
 
 		return c.list();
 	}
-	
+
 	public List<Ruta> buscarPorClaseServicioEmpresa(ClaseServicio claseServicio, Empresa empresa) {
 		StringBuffer hql = new StringBuffer();
 		hql.append("SELECT DISTINCT r ");
@@ -160,7 +160,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
 
 		return c.list();
 	}
-	
+
 	public List<Ruta> buscarTodosEstos(Integer[] idRutas) {
 		Criteria c = this.makeCriteria();
 		c.add(Restrictions.in("rutaId", idRutas));
@@ -178,7 +178,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
 		return c.list();
 	}
 
-		public List<Ruta> buscaRuta(String palavraPesquisaRuta) {
+	public List<Ruta> buscaRuta(String palavraPesquisaRuta) {
 
 		StringBuffer hql = new StringBuffer();
 		hql.append(" FROM  Ruta    ");
@@ -193,7 +193,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
 		return lsRuta;
 	}
 
-	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao){
+	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) {
 		StringBuffer hql = new StringBuffer();
 		hql.append("select distinct r FROM  Ruta  r inner join  r.rutaSecuenciaList rSeqList  ");
 		hql.append(" inner join  rSeqList.lsRutaCase casRutaList  ");