diff --git a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java b/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java index 427cfd410..4f9b4e59f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java @@ -38,7 +38,7 @@ public interface ConferenciaComissaoDAO extends GenericDAO { public LogConferencia obtenerLogConferenciaID(Long logconferenciaId); - public List carregarBilhetesComissao(Conferencia conferencia) throws BusinessException; + public List carregarBilhetesComissao(Conferencia conferencia, boolean ehConsultaComissao) throws BusinessException; public List carregarOcds(Conferencia conferencia) throws BusinessException; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java index ee5f4a7c9..746eb4c02 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java @@ -798,7 +798,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO carregarBilhetesComissao(Conferencia conferencia) + public List carregarBilhetesComissao(Conferencia conferencia, boolean ehConsultaComissao) throws BusinessException { try { Map parametros = carregarParametros(null, null, conferencia.getCompetencia(), conferencia.getEmpresa(), @@ -842,7 +842,11 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO receitasBoleto = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia); + List receitasBoleto = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia, true); List eventosFinanceirosVOs = conferenciaComissaoDAO.carregarEventosFinanceiros(conferencia); Calendar calendario = Calendar.getInstance(); diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java index 8ef147481..dddd82003 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java @@ -192,7 +192,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic } if (boletoComissaos == null || boletoComissaos.isEmpty()) { - boletoComissaos = conferenciaComissaoDAO.carregarBilhetesComissao(c); + boletoComissaos = conferenciaComissaoDAO.carregarBilhetesComissao(c, false); } if(boletoStatusComissao == null){ @@ -242,7 +242,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic @Override public List carregarBilhetesComissao(List boletoComissaos, Conferencia conferencia, BoletoStatusComissao boletoStatusComissao, boolean carregarDadosFaltantes) throws BusinessException { if (boletoComissaos == null) { - boletoComissaos = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia); + boletoComissaos = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia, false); } if (boletoStatusComissao == null) {