Download as
Browse Code »

Commit 47351c79ab0a58ba97f64774d10889328922df89

Authored by geovane.filho
1 parent a9a38045
Exists in master

Redmine #4922 Correção de busca de atendimentos e baixas de entradas com data contabil nula

Showing 2 changed files with 29 additions and 17 deletions   Show diff stats
cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/AtendimentoRequisicaoConsumoItemDaoHibernate.java
  Diff comments   View file @47351c7
1 1 package br.com.centralit.api.dao.impl;
2 2  
  3 +import java.util.ArrayList;
3 4 import java.util.Calendar;
4 5 import java.util.Collection;
5 6 import java.util.List;
... ... @@ -12,6 +13,7 @@ import br.com.centralit.api.model.AtendimentoRequisicaoConsumoItem;
12 13 import br.com.centralit.api.viewHelper.AtendimentoVH;
13 14 import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl;
14 15 import br.com.centralit.framework.dao.arquitetura.SearchSeven;
  16 +import br.com.centralit.framework.util.UtilObjeto;
15 17  
16 18 @Repository("atendimentoRequisicaoConsumoItemDao")
17 19 public class AtendimentoRequisicaoConsumoItemDaoHibernate extends CitGenericDAOImpl implements AtendimentoRequisicaoConsumoItemDao {
... ... @@ -85,13 +87,17 @@ public class AtendimentoRequisicaoConsumoItemDaoHibernate extends CitGenericDAOI
85 87 */
86 88 @Override
87 89 public List<String> buscarAtendimentosComMateriaisEDataMaior(List<Long> idsMateriais, Calendar dataReferencia) {
88   - SearchSeven searchSeven = new SearchSeven();
89   -
90   - searchSeven.addField("atendimentoRequisicaoConsumo.numeroAtendimento");
91   - searchSeven.addFilterIn("material.id", idsMateriais);
92   - searchSeven.addFilterGreaterOrEqual("atendimentoRequisicaoConsumo.dataAtendimento", dataReferencia);
93   - searchSeven.setDistinct(true);
94   -
95   - return this.search(searchSeven);
  90 + if (UtilObjeto.isReferencia(dataReferencia)) {
  91 + SearchSeven searchSeven = new SearchSeven();
  92 +
  93 + searchSeven.addField("atendimentoRequisicaoConsumo.numeroAtendimento");
  94 + searchSeven.addFilterIn("material.id", idsMateriais);
  95 + searchSeven.addFilterGreaterOrEqual("atendimentoRequisicaoConsumo.dataAtendimento", dataReferencia);
  96 + searchSeven.setDistinct(true);
  97 +
  98 + return this.search(searchSeven);
  99 + } else {
  100 + return new ArrayList<String>();
  101 + }
96 102 }
97 103 }
... ...
cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/BaixaAlmoxarifadoItemDaoHibernate.java
  Diff comments   View file @47351c7
1 1 package br.com.centralit.api.dao.impl;
2 2  
  3 +import java.util.ArrayList;
3 4 import java.util.Calendar;
4 5 import java.util.List;
5 6  
... ... @@ -10,6 +11,7 @@ import org.springframework.stereotype.Repository;
10 11  
11 12 import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl;
12 13 import br.com.centralit.framework.dao.arquitetura.SearchSeven;
  14 +import br.com.centralit.framework.util.UtilObjeto;
13 15  
14 16 @Repository("baixaAlmoxarifadoItemDao")
15 17 public class BaixaAlmoxarifadoItemDaoHibernate extends CitGenericDAOImpl implements BaixaAlmoxarifadoItemDao {
... ... @@ -19,14 +21,18 @@ public class BaixaAlmoxarifadoItemDaoHibernate extends CitGenericDAOImpl impleme
19 21  
20 22 @Override
21 23 public List<String> buscarBaixasComMateriaisEDataMaior(List<Long> idsMateriais, Calendar dataReferencia) {
22   - SearchSeven searchSeven = new SearchSeven();
23   -
24   - searchSeven.addField("baixaAlmoxarifado.numeroBaixa");
25   - searchSeven.addFilterIn("materialConsumo.id", idsMateriais);
26   - searchSeven.addFilterGreaterOrEqual("baixaAlmoxarifado.dataBaixa", dataReferencia);
27   - searchSeven.addFilterNull("dataEstorno");
28   - searchSeven.setDistinct(true);
29   -
30   - return this.search(searchSeven);
  24 + if (UtilObjeto.isReferencia(dataReferencia)) {
  25 + SearchSeven searchSeven = new SearchSeven();
  26 +
  27 + searchSeven.addField("baixaAlmoxarifado.numeroBaixa");
  28 + searchSeven.addFilterIn("materialConsumo.id", idsMateriais);
  29 + searchSeven.addFilterGreaterOrEqual("baixaAlmoxarifado.dataBaixa", dataReferencia);
  30 + searchSeven.addFilterNull("dataEstorno");
  31 + searchSeven.setDistinct(true);
  32 +
  33 + return this.search(searchSeven);
  34 + } else {
  35 + return new ArrayList<String>();
  36 + }
31 37 }
32 38 }
... ...