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
master
edgar 2016-08-05 13:07:38 +00:00
parent 4b41676157
commit 15ee106eb4
1 changed files with 8 additions and 8 deletions

View File

@ -61,7 +61,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
Criteria c = getSession().createCriteria(getPersistentClass()); Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE)); c.add(Restrictions.eq("activo", Boolean.TRUE));
c.add(Restrictions.eq("indRutaCancelada", false));
Criteria cEmpresa = c.createCriteria("lsRutaEmpresa"); Criteria cEmpresa = c.createCriteria("lsRutaEmpresa");
cEmpresa.add(Restrictions.in("empresa", lsEmpresas)); cEmpresa.add(Restrictions.in("empresa", lsEmpresas));
cEmpresa.add(Restrictions.eq("activo", Boolean.TRUE)); cEmpresa.add(Restrictions.eq("activo", Boolean.TRUE));
@ -193,7 +193,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
return lsRuta; return lsRuta;
} }
public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao){ public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) {
StringBuffer hql = new StringBuffer(); StringBuffer hql = new StringBuffer();
hql.append("select distinct r FROM Ruta r inner join r.rutaSecuenciaList rSeqList "); hql.append("select distinct r FROM Ruta r inner join r.rutaSecuenciaList rSeqList ");
hql.append(" inner join rSeqList.lsRutaCase casRutaList "); hql.append(" inner join rSeqList.lsRutaCase casRutaList ");