From af2238ed5909e0d42a96069e07f37123449ef0eb Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 19 Jan 2018 20:40:39 +0000
Subject: [PATCH] fixes bug #10407

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78203 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/ConferenciaComissaoHibernateDAO.java | 10 +++++++---
 .../rjconsultores/ventaboletos/utilerias/DateUtil.java |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

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<Confere
 	private void carregarPuntoVentas(List<ConferenciaComissaoVO> lsConferencias, Date dataInicial, Date dataFinal,
 			Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento) throws BusinessException {
 
-		Set<Integer> diasSemMovimentos = DateUtil.carregarDiasCompetencia(dataInicial, dataFinal, dataMovimento);
+		Set<Integer> 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<Confere
 			List<ConferenciaComissaoVO> lsConferencias, String competencia, Date dataMovimento, Date dataInicial, Date dataFinal) throws ParseException {
 
 		Set<Integer> diasSemMovimentos = new TreeSet<Integer>();
-		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<Integer> carregarDiasCompetencia(Date dataInicial, Date dataFinal, Date dataMovimento) {
+	public static Set<Integer> carregarDiasCompetencia(Date dataInicial, Date dataFinal) {
 		Set<Integer> diasCompetencia = new TreeSet<Integer>();
 
 			Calendar cal = Calendar.getInstance();