Download as
Browse Code »

Commit fbcb9b031d401b6af786b101f90d945103c1bc0d

Authored by maycon.silva
2 parents 8f412b1d 6f3c474b
Exists in master

Merge branch 'desenvolvimento' of http://ferramentasgo.centralit.com.br:8080/scm… 

…/git/cit-grp-ecm into desenvolvimento
Showing 1 changed file with 13 additions and 8 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/ProcessoDaoHibernate.java
  Diff comments   View file @fbcb9b0
@@ -10,6 +10,7 @@ import javax.persistence.FetchType; @@ -10,6 +10,7 @@ import javax.persistence.FetchType;
10 import org.hibernate.Criteria; 10 import org.hibernate.Criteria;
11 import org.hibernate.Session; 11 import org.hibernate.Session;
12 import org.hibernate.criterion.DetachedCriteria; 12 import org.hibernate.criterion.DetachedCriteria;
  13 +import org.hibernate.criterion.Order;
13 import org.hibernate.criterion.Projections; 14 import org.hibernate.criterion.Projections;
14 import org.hibernate.criterion.Restrictions; 15 import org.hibernate.criterion.Restrictions;
15 import org.hibernate.criterion.Subqueries; 16 import org.hibernate.criterion.Subqueries;
@@ -314,21 +315,25 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD @@ -314,21 +315,25 @@ public class ProcessoDaoHibernate extends CitGenericDAOImpl implements ProcessoD
314 @Override 315 @Override
315 public Collection<Processo> autoCompleteProcessoEmAndamentoByNup(String nup) { 316 public Collection<Processo> autoCompleteProcessoEmAndamentoByNup(String nup) {
316 317
317 - Search search = new SearchSeven(this.persistentClass); 318 + Criteria criteriaProcesso = this.newCriteria(Processo.class);
318 319
319 - search.addFilterOr(Filter.ilike("nup", "%" + nup + "%"), Filter.ilike("nup", "%" + nup + "%")); 320 + criteriaProcesso.add(Restrictions.ilike("nup", "%" + nup + "%"));
320 321
321 - search.getFilters().add(Filter.notEqual("status.codigo", 1L)); 322 + criteriaProcesso.createAlias("status", "status", JoinType.LEFT_OUTER_JOIN);
322 323
323 - search.getFilters().add(Filter.notEqual("status.codigo", 5L)); 324 + criteriaProcesso.add(Restrictions.not(Restrictions.eq("status.codigo", 1L)));
324 325
325 - search.getFilters().add(Filter.notEqual("status.codigo", 3L)); 326 + criteriaProcesso.add(Restrictions.not(Restrictions.eq("status.codigo", 5L)));
326 327
327 - search.addSortDesc("id"); 328 + criteriaProcesso.add(Restrictions.not(Restrictions.eq("status.codigo", 3L)));
328 329
329 - search.setMaxResults(10); 330 + this.filterProcessoPermissaoUsuario(criteriaProcesso);
330 331
331 - return this.search(search); 332 + criteriaProcesso.addOrder(Order.desc("id"));
  333 +
  334 + criteriaProcesso.setMaxResults(10);
  335 +
  336 + return criteriaProcesso.list();
332 } 337 }
333 338
334 @Override 339 @Override