diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java index 1cc2ad604..d0cd9d30a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java @@ -150,7 +150,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO lsConferencias, Date dataInicial, Date dataFinal, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento) throws BusinessException { - Set diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal, dataMovimento); + Set diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal); ConferenciaComissaoVO conferenciaComissao = new ConferenciaComissaoVO(); conferenciaComissao.setPuntoventaId(puntoVenta.getPuntoventaId()); conferenciaComissao.setNombpuntoventa(puntoVenta.getNombpuntoventa()); @@ -335,8 +335,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO lsConferencias, String competencia, Date dataMovimento, Date dataInicial, Date dataFinal) throws ParseException { Set diasSemMovimentos = new TreeSet(); - if (dataMovimento != null) { - DateUtil.carregarDiasCompetencia(competencia, dataMovimento); + if(dataInicial != null && dataFinal != null) { + diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal); + } + + if (competencia != null) { + diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia, dataMovimento); } for (ConferenciaComissaoVO conferenciaComissaoMovimentoDiario : lsQuery) { diff --git a/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java b/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java index 5b18abc28..1f0f6a233 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java @@ -612,7 +612,7 @@ public final class DateUtil { return diasCompetencia; } - public static Set carregarDiasCompetencia(Date dataInicial, Date dataFinal, Date dataMovimento) { + public static Set carregarDiasCompetencia(Date dataInicial, Date dataFinal) { Set diasCompetencia = new TreeSet(); Calendar cal = Calendar.getInstance();