From be5c235a9fe419ecbe3e49937ac61da47e2fae22 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 12 Jul 2016 13:14:41 +0000
Subject: [PATCH] fixes bug #7678

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index ec8cabddd..619f95f55 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -193,11 +193,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			StringBuilder sQuery = new StringBuilder("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(B.FECHORVENTA, 'DD/MM/YY') as \"datamovimento\" ");
 			sQuery.append("FROM BOLETO B ")
 				  .append("INNER JOIN PUNTO_VENTA PV ON B.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ")
+				  .append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ")
 				  .append("WHERE PV.ACTIVO = 1 ")
 				  .append("AND B.FECHORVENTA BETWEEN ? AND ? ");
 			
 			if(parametros.containsKey("empresaId")) {
-				sQuery.append("AND B.MARCA_ID = ? ");
+				sQuery.append("AND M.EMPRESA_ID = ? ");
 			}
 
 			if(parametros.containsKey("puntoventaId")) {
@@ -660,14 +661,15 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				  .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("INNER JOIN USUARIO U ON B.USUARIO_ID = U.USUARIO_ID ")
-				  .append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = B.MARCA_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("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 MARCA M ON B.MARCA_ID = M.MARCA_ID ")
+				  .append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
+				  .append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ")
+				  .append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = B.CATEGORIA_ID AND COMCAT.EMPRESA_ID = M.EMPRESA_ID AND COMCAT.ACTIVO = 1 ")
 				  .append("WHERE B.ACTIVO = 1 ")
 				  .append("AND B.FECHORVENTA BETWEEN TO_DATE(:dataMovimentoInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataMovimentoFinal, 'DD/MM/YYYY HH24:MI') ");
 			
 			if(parametros.containsKey("empresaId")) {
-				sQuery.append("AND B.MARCA_ID = :empresaId ");
+				sQuery.append("AND M.MARCA_ID = :empresaId ");
 			}
 
 			if(parametros.containsKey("puntoventaId")) {
@@ -762,10 +764,11 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				  .append("U.NOMBUSUARIO AS \"nombusuario\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", U.CVEUSUARIO AS \"login\", B.NUMFOLIOSISTEMA AS \"numFolioSistema\", ")
 				  .append("CEC.INDOCD AS \"exigeConferenciaAba\" ")
 				  .append("FROM OCD O ")
-				  .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = O.BOLETO_ID ")
+				  .append("INNER JOIN BOLETO B ON B.BOLETO_ID = O.BOLETO_ID ")
+				  .append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ")
 				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.OCD_ID = O.OCD_ID AND LOG.ACTIVO = 1 ")
 				  .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("LEFT JOIN COM_EMP_CONFERENCIA CEC ON CEC.EMPRESA_ID = M.EMPRESA_ID AND CEC.ACTIVO = 1 ")
 				  .append("WHERE O.ACTIVO = 1 ")
 				  .append("AND O.FECPAGO BETWEEN TO_DATE(:dataMovimentoInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataMovimentoFinal, 'DD/MM/YYYY HH24:MI') ")
 				  .append("AND O.INDPAGO = 1 ");