fixes bug #6565
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@46923 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
50c97f60d1
commit
2adaa14c47
|
@ -7,11 +7,11 @@ package com.rjconsultores.ventaboletos.dao.hibernate;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.hibernate.Criteria;
|
import org.hibernate.Criteria;
|
||||||
|
import org.hibernate.Query;
|
||||||
import org.hibernate.SessionFactory;
|
import org.hibernate.SessionFactory;
|
||||||
import org.hibernate.criterion.Order;
|
import org.hibernate.criterion.Order;
|
||||||
import org.hibernate.criterion.Projections;
|
import org.hibernate.criterion.Projections;
|
||||||
import org.hibernate.criterion.Restrictions;
|
import org.hibernate.criterion.Restrictions;
|
||||||
import org.hibernate.Query;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
import org.springframework.beans.factory.annotation.Qualifier;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
@ -41,6 +41,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer>
|
||||||
public List<Ruta> obtenerTodos() {
|
public List<Ruta> obtenerTodos() {
|
||||||
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.ne("rutaId", -1));
|
||||||
c.addOrder(Order.asc("descruta"));
|
c.addOrder(Order.asc("descruta"));
|
||||||
|
|
||||||
return c.list();
|
return c.list();
|
||||||
|
@ -97,6 +98,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer>
|
||||||
public List<Ruta> obtenerPorEmpresa(Empresa empresa) {
|
public List<Ruta> obtenerPorEmpresa(Empresa empresa) {
|
||||||
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.ne("rutaId", -1));
|
||||||
|
|
||||||
if (empresa.getEmpresaId() != -1) {
|
if (empresa.getEmpresaId() != -1) {
|
||||||
c.createCriteria("lsRutaEmpresa").add(Restrictions.eq("empresa", empresa));
|
c.createCriteria("lsRutaEmpresa").add(Restrictions.eq("empresa", empresa));
|
||||||
|
@ -167,4 +169,5 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer>
|
||||||
return lsRuta;
|
return lsRuta;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue