bug #6602
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@47919 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
0e6820d83a
commit
b525b1870a
|
@ -44,10 +44,11 @@ public class ClasseServicoHibernateDAO extends GenericHibernateDAO<ClaseServicio
|
||||||
|
|
||||||
return c.list();
|
return c.list();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ClaseServicio> buscarTodosExceto(Integer... idClase) {
|
public List<ClaseServicio> buscarTodosExceto(Integer... idClase) {
|
||||||
Criteria c = this.makeCriteria();
|
Criteria c = this.makeCriteria();
|
||||||
for (Integer id : idClase) {
|
for (Integer id : idClase) {
|
||||||
c.add(Restrictions.ne("claseservicioId", id.shortValue()));
|
c.add(Restrictions.ne("claseservicioId", id));
|
||||||
}
|
}
|
||||||
c.add(Restrictions.eq("activo", Boolean.TRUE));
|
c.add(Restrictions.eq("activo", Boolean.TRUE));
|
||||||
c.addOrder(Order.asc("descclase"));
|
c.addOrder(Order.asc("descclase"));
|
||||||
|
|
|
@ -168,7 +168,7 @@ public class TarifaMinimaHibernateDAO extends GenericHibernateDAO<TarifaMinima,
|
||||||
criterioBusca.add(Restrictions.eq("moneda", moneda));
|
criterioBusca.add(Restrictions.eq("moneda", moneda));
|
||||||
|
|
||||||
criterioBusca.add(Restrictions.or(Restrictions.eq("marca", marca), Restrictions.eq("marca.marcaId", (short) -1)));
|
criterioBusca.add(Restrictions.or(Restrictions.eq("marca", marca), Restrictions.eq("marca.marcaId", (short) -1)));
|
||||||
criterioBusca.add(Restrictions.or(Restrictions.eq("claseServicio", claseServicio),Restrictions.eq("claseServicio.claseservicioId", (short) -1)));
|
criterioBusca.add(Restrictions.or(Restrictions.eq("claseServicio", claseServicio), Restrictions.eq("claseServicio.claseservicioId", -1)));
|
||||||
|
|
||||||
return criterioBusca.list();
|
return criterioBusca.list();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue