From 91b0a716cf4715ce25773c4ecf950b70005aa0e6 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 30 May 2016 20:30:49 +0000
Subject: [PATCH] fixes bug #7501

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@56479 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ConferenciaComissaoHibernateDAO.java      | 87 -------------------
 1 file changed, 87 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 013344fe6..146bfa31a 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -717,7 +717,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				  .append("INNER JOIN USUARIO U ON O.USUARIOPAGO_ID = U.USUARIO_ID ")
 				  .append("LEFT JOIN COM_EMP_CONFERENCIA CEC ON CEC.EMPRESA_ID = B.EMPRESACORRIDA_ID AND CEC.ACTIVO = 1 ")
 				  .append("WHERE O.ACTIVO = 1 ")
-				  .append("AND LOG.ACTIVO = 1 ")
 				  .append("AND TO_DATE(O.FECPAGO,'DD/MM/YY') = :datamovimento ")
 				  .append("AND O.INDPAGO = 1 ");
 			
@@ -840,92 +839,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 		}
 	}
 
-	/*@Override
-	@SuppressWarnings("deprecation")
-	public boolean isBilhetesSemConferencia(Conferencia conferencia) throws BusinessException {
-		try {
-			Map<String, Object> parametros = carregarParametros(null, conferencia.getEmpresa(), conferencia.getPuntoVenta());
-			
-			StringBuilder sQuery = new StringBuilder();
-			sQuery.append("SELECT B.BOLETO_ID AS \"boletoId\" ")
-				  .append("FROM BOLETO B ")
-				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.BOLETO_ID = B.BOLETO_ID AND LOG.ACTIVO = 1 ")
-				  .append("INNER JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = B.CATEGORIA_ID ")
-				  .append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = B.CATEGORIA_ID AND COMCAT.EMPRESA_ID = B.EMPRESACORRIDA_ID AND COMCAT.ACTIVO = 1 ")
-				  .append("INNER JOIN BOLETO_FORMAPAGO BF ON BF.BOLETO_ID = B.BOLETO_ID ")
-				  .append("INNER JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = BF.FORMAPAGO_ID ")
-				  .append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = B.EMPRESACORRIDA_ID AND COMFP.ACTIVO = 1 ")
-				  .append("WHERE B.ACTIVO = 1 ")
-				  .append("AND LOG.LOGCONFERENCIA_ID IS NULL ")
-				  .append("AND (COMFP.COMEMPFORMAPAGO_ID IS NOT NULL OR COMCAT.COMEMPCATEGORIA_ID IS NOT NULL) ")
-				  .append("AND TO_DATE(B.FECHORVENTA,'DD/MM/YY') = :datamovimento ");
-			
-			parametros.put("datamovimento", conferencia.getDatamovimento());
-			
-			if(parametros.containsKey("empresaId")) {
-				sQuery.append("AND B.EMPRESACORRIDA_ID = :empresaId ");
-			}
-
-			if(parametros.containsKey("puntoventaId")) {
-				sQuery.append("AND B.PUNTOVENTA_ID = :puntoventaId ");
-			}
-			
-			log.info(sQuery.toString());
-			
-			Query qr = getSession().createSQLQuery(sQuery.toString())
-								   .addScalar("boletoId", Hibernate.LONG)
-								   .setResultTransformer(Transformers.aliasToBean(BoletoComissao.class));
-			setParametros(qr, parametros);
-			
-			return !qr.list().isEmpty();
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-			throw new BusinessException(e.getMessage(), e);
-		}
-	}
-
-	@Override
-	@SuppressWarnings("deprecation")
-	public boolean isEventosFinanceirosSemConferencia(Conferencia conferencia) throws BusinessException {
-		try {
-			Map<String, Object> parametros = carregarParametros(null, conferencia.getEmpresa(), conferencia.getPuntoVenta());
-			StringBuilder sQuery = new StringBuilder();
-			sQuery.append("SELECT EE.EVENTOEXTRA_ID AS \"eventoextraId\" ")
-				  .append("FROM EVENTO_EXTRA EE ")
-				  .append("JOIN TIPO_EVENTO_EXTRA TEE ON EE.TIPOEVENTOEXTRA_ID = TEE.TIPOEVENTOEXTRA_ID ")
-				  .append("LEFT JOIN COM_EMP_TIPOEVENTOEXTRA COMTEE ON COMTEE.TIPOEVENTOEXTRA_ID = TEE.TIPOEVENTOEXTRA_ID AND COMTEE.EMPRESA_ID = EE.EMPRESA_ID AND COMTEE.ACTIVO = 1 ")
-				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID AND LOG.ACTIVO = 1 ")
-				  .append("LEFT JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = EE.FORMAPAGO_ID ")
-				  .append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = EE.EMPRESA_ID AND COMFP.ACTIVO = 1 ")
-				  .append("WHERE EE.ACTIVO = 1 ")
-				  .append("AND LOG.LOGCONFERENCIA_ID IS NULL ")
-				  .append("AND (COMTEE.COMEMPTIPOEVENTOEXTRA_ID IS NOT NULL OR COMFP.COMEMPFORMAPAGO_ID IS NOT NULL) ")
-				  .append("AND TO_DATE(EE.FECHORINGRESO,'DD/MM/YY') = :datamovimento ");
-			
-			parametros.put("datamovimento", conferencia.getDatamovimento());
-			
-			if(parametros.containsKey("empresaId")) {
-				sQuery.append("AND EE.EMPRESA_ID = :empresaId ");
-			}
-
-			if(parametros.containsKey("puntoventaId")) {
-				sQuery.append("AND EE.PUNTOVENTA_ID = :puntoventaId ");
-			}
-			
-			log.info(sQuery.toString());
-			
-			Query qr = getSession().createSQLQuery(sQuery.toString())
-								   .addScalar("eventoextraId", Hibernate.LONG)
-								   .setResultTransformer(Transformers.aliasToBean(EventosFinanceirosVO.class));			
-			setParametros(qr, parametros);
-			
-			return !qr.list().isEmpty();
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-			throw new BusinessException(e.getMessage(), e);
-		}
-	}*/
-
 	@Override
 	public boolean isConferenciaCompetenciaEncerrada(String competencia, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException {
 		try {