Skip to content

Commit

Permalink
EX - Corrige o fato de marcador criado no dia não ser exibido na list…
Browse files Browse the repository at this point in the history
…a de marcadores gerais para se inserir no documentos.
  • Loading branch information
jmolivei committed Jan 25, 2024
1 parent 9774139 commit e438f10
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion siga-cp/src/main/java/br/gov/jfrj/siga/dp/dao/CpDao.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import java.lang.reflect.InvocationTargetException;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -2977,7 +2978,7 @@ public List<CpMarcador> listarCpMarcadoresGerais(Boolean ativos) {
if (ativos == null || ativos) {
Predicate predicateNullHisDtFim = criteriaBuilder.isNull(cpMarcadorRoot.get("hisDtFim"));
Predicate predicateNullHisDtIni = criteriaBuilder.isNull(cpMarcadorRoot.get("hisDtIni"));
Predicate predicateHisDtIniLeToday = criteriaBuilder.lessThan(cpMarcadorRoot.<Date>get("hisDtIni"), criteriaBuilder.currentDate());
Predicate predicateHisDtIniLeToday = criteriaBuilder.lessThan(cpMarcadorRoot.<Timestamp>get("hisDtIni"), criteriaBuilder.currentTimestamp());
criteriaQuery.where(criteriaBuilder
.and(predicateAnd, predicateNullHisDtFim,
criteriaBuilder.or(predicateNullHisDtIni, predicateHisDtIniLeToday)));
Expand Down

0 comments on commit e438f10

Please sign in to comment.