Commit 478c9dca754dc2ef676084db6d1fc53b221d3d06
1 parent
069e12d2
Exists in
master
[Redmine Atendimento #4576]Notificação fechamento mes
Showing
1 changed file
with
6 additions
and
2 deletions
Show diff stats
cit-almoxarifado-api/src/main/java/br/com/centralit/api/job/NotificacaoRessuprimentoJob.java
... | ... | @@ -211,7 +211,11 @@ public class NotificacaoRessuprimentoJob implements Job { |
211 | 211 | NotificacaoUsuario notificacaoUsuario = null; |
212 | 212 | |
213 | 213 | SearchParams params = new SearchParams(); |
214 | - params.setFilters(Arrays.asList(new Filter[]{new Filter("notificacao.id", ConstantsQuery.TYPE_NUMERIC, configuracao.getNotificacao().getId().toString(), ConstantsQuery.COMPARE_EQUALS)})); | |
214 | + params.setFilters(Arrays.asList(new Filter[]{new Filter("notificacao.id", ConstantsQuery.TYPE_NUMERIC, | |
215 | + configuracao.getNotificacao().getId().toString(), ConstantsQuery.COMPARE_EQUALS), | |
216 | + new Filter("notificacao.dataVisualizacao", ConstantsQuery.TYPE_DATE, null, ConstantsQuery.COMPARE_EMPTY), | |
217 | + new Filter("notificacao.mensagem", ConstantsQuery.TYPE_STRING, configuracao.getNotificacao().getMensagem(), ConstantsQuery.COMPARE_EQUALS)})); | |
218 | + | |
215 | 219 | params.setStart(0); |
216 | 220 | params.setLimit(Integer.MAX_VALUE); |
217 | 221 | params.setFields(Arrays.asList(new String[]{"usuario.email", "usuario.username", "notificacao.mensagem"})); |
... | ... | @@ -267,7 +271,7 @@ public class NotificacaoRessuprimentoJob implements Job { |
267 | 271 | e.printStackTrace(); |
268 | 272 | } |
269 | 273 | |
270 | - return qtdMaterialEstoque.compareTo(BigDecimal.ZERO) > 0 && qtdMaterialEstoque.compareTo(configuracao.getLimiteEstoque()) <= 0; | |
274 | + return qtdMaterialEstoque.compareTo(configuracao.getLimiteEstoque()) <= 0; | |
271 | 275 | } |
272 | 276 | |
273 | 277 | } | ... | ... |