diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java index aae8fc3fd..e2d947af0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java @@ -100,7 +100,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO lsConferencias, String competencia, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException { try { @@ -132,6 +131,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO lsConferencias, String competencia, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException { try { @@ -174,7 +173,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO parametros) { for (Entry parametro : parametros.entrySet()) { if (parametro.getValue() instanceof Collection) { @@ -499,14 +497,13 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO carregarEventosFinanceiros(Conferencia conferencia) throws BusinessException { try { Map parametros = carregarParametros(null, conferencia.getEmpresa(), conferencia.getPuntoVenta(), conferencia.getDatamovimento()); StringBuilder sQuery = new StringBuilder() - .append("SELECT EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ") + .append("SELECT EE.BOLETO_ID AS \"boletoId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ") .append("EE.IMPINGRESO AS \"impingreso\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", EE.DESCINFO AS \"descinfo\", ") .append("LOG.STATUS AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", FP.DESCPAGO AS \"descpago\", ") .append("TEE.INDTIPO AS \"indtipo\", U.NOMBUSUARIO AS \"nombusuario\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", ") @@ -531,7 +528,9 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO carregarLogConferencia(Conferencia conferencia) throws BusinessException { try { @@ -579,6 +577,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO carregarBilhetesComissao(Conferencia conferencia) throws BusinessException { try { @@ -717,6 +715,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO carregarOcds(Conferencia conferencia) throws BusinessException { try { Map parametros = carregarParametros(null, conferencia.getEmpresa(), @@ -823,6 +821,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO lsLogConferencia = carregarLogConferencia(conferencia.getConferenciaId()); String sDataMovimento = DateUtil.getStringDate(conferencia.getDatamovimento(), "dd/MM/yyyy"); String descOperacion = "CONFERENCIA MOVIMENTO DIA - " + sDataMovimento; for (LogConferencia logConferencia : lsLogConferencia) { - - Calendar cal = Calendar.getInstance(); - + if(!Boolean.TRUE.equals(logConferencia.getIndmesmodia())){ cal.add(Calendar.DAY_OF_MONTH, 1); } @@ -918,7 +916,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO carregarLogConferencia(Long conferenciaId) throws BusinessException { try { StringBuilder sQuery = new StringBuilder() @@ -978,7 +975,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO