From bc7705da2d1351044bbffd0d2518abc11129742e Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 11 May 2016 21:38:47 +0000
Subject: [PATCH] fixes bug #7462

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@55860 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ConferenciaComissaoHibernateDAO.java      | 43 +++++++------------
 .../ventaboletos/vo/comissao/OcdVO.java       | 32 ++++++++++++++
 2 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 67baca724..6796076b4 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -3,7 +3,6 @@ package com.rjconsultores.ventaboletos.dao.hibernate;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
@@ -183,6 +182,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				sQuery.append("AND PV.PUNTOVENTA_ID = :puntoventaId ");
 			}
 			
+			sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(B.FECHORVENTA, 'DD/MM/YY') ");
+			
 			log.info(sQuery.toString());
 			
 			Query qr = getSession().createSQLQuery(sQuery.toString())
@@ -443,8 +444,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				  .append("INNER JOIN USUARIO U ON EE.USUARIO_ID = U.USUARIO_ID ")
 				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID ")
 				  .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 ")
-				  .append("LEFT JOIN COM_EMP_TIPOEVENTOEXTRA COMTEE ON COMTEE.TIPOEVENTOEXTRA_ID = TEE.TIPOEVENTOEXTRA_ID AND COMTEE.EMPRESA_ID = EE.EMPRESA_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("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("WHERE EE.ACTIVO = 1 ")
 				  .append("AND TO_DATE(EE.FECHORINGRESO,'DD/MM/YY') = :datamovimento ");
 			
@@ -608,8 +609,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				  .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 ")
-				  .append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = B.CATEGORIA_ID AND COMCAT.EMPRESA_ID = B.EMPRESACORRIDA_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("WHERE B.ACTIVO = 1 ")
 				  .append("AND TO_DATE(B.FECHORVENTA,'DD/MM/YY') = :datamovimento ");
 			
@@ -699,7 +700,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			
 			StringBuilder sQuery = new StringBuilder();
 			sQuery.append("SELECT DISTINCT O.OCD_ID AS \"ocdId\", O.NUMOPERACION AS \"numoperacion\", O.FECINC AS \"fecinc\", O.FECPAGAR AS \"fecpagar\", O.FECPAGO AS \"fecpago\", ")
-				  .append("O.INDPAGO AS \"indpago\", O.VALOR_PAGAR AS \"valorPagar\", (B.PRECIOPAGADO * (O.PENALIZACION / 100)) AS \"penalizacion\", LOG.STATUS AS \"status\", U.NOMBUSUARIO AS \"nombusuario\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\" ")
+				  .append("O.INDPAGO AS \"indpago\", O.VALOR_PAGAR AS \"valorPagar\", (B.PRECIOPAGADO * (O.PENALIZACION / 100)) AS \"penalizacion\", LOG.STATUS AS \"status\", ")
+				  .append("U.NOMBUSUARIO AS \"nombusuario\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", U.CVEUSUARIO AS \"login\", B.NUMFOLIOSISTEMA AS \"numFolioSistema\" ")
 				  .append("FROM OCD O ")
 				  .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = O.BOLETO_ID ")
 				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.OCD_ID = O.OCD_ID ")
@@ -715,7 +717,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			}
 
 			if(parametros.containsKey("puntoventaId")) {
-				sQuery.append("AND O.PUNTOVENTA_ID = :puntoventaId ");
+				sQuery.append("AND O.PUNTOVENTAPAGO_ID = :puntoventaId ");
 			}
 			
 			log.info(sQuery.toString());
@@ -732,6 +734,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 								   .addScalar("status", Hibernate.INTEGER)
 								   .addScalar("nombusuario", Hibernate.STRING)
 								   .addScalar("logconferenciaId", Hibernate.STRING)
+								   .addScalar("login", Hibernate.STRING)
+								   .addScalar("numFolioSistema", Hibernate.STRING)
 								   .setResultTransformer(Transformers.aliasToBean(OcdVO.class));
 			setParametros(qr, parametros);
 			
@@ -834,31 +838,16 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				  .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 ")
+				  .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 ")
+				  .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 ")
-				  .append("AND B.TIPOVENTA_ID IN (:tipoVenta) ")
-				  .append("AND ( ")
-				  .append("		(B.INDSTATUSBOLETO = 'V' AND (B.MOTIVOCANCELACION_ID IS NULL OR B.MOTIVOCANCELACION_ID IN (:motivocancelacionIdVenda))) ")
-				  .append("		OR ")
-				  .append("		(B.INDSTATUSBOLETO = 'C' AND B.MOTIVOCANCELACION_ID IN (:motivocancelacionId)) ")
-				  .append("		OR ")
-				  .append("		(B.INDSTATUSBOLETO = 'T' AND (B.MOTIVOCANCELACION_ID IS NULL OR B.MOTIVOCANCELACION_ID IN (:motivocancelacionId))) ")
-				  .append("		OR ")
-				  .append("		(B.INDSTATUSBOLETO = 'E' AND (B.MOTIVOCANCELACION_ID IS NULL OR B.MOTIVOCANCELACION_ID IN (:motivocancelacionIdVenda))) ")
-				  .append("		OR ")
-				  .append("		(B.INDSTATUSBOLETO = 'C' AND B.MOTIVOCANCELACION_ID IN (:motivocancelacionIdVenda)) ")
-				  .append("	   ) ");
+				  .append("AND TO_DATE(B.FECHORVENTA,'DD/MM/YY') = :datamovimento ");
 			
 			parametros.put("datamovimento", conferencia.getDatamovimento());
-			parametros.put("tipoVenta", Arrays.asList(Constantes.TPV_BOLETO_REMOTO,Constantes.TPV_MANUAL,Constantes.TPV_DIRECTO_NORMAL,Constantes.TPV_TRANSFERENCIAS,Constantes.TPV_CAMBIO_VIAJE));
-			parametros.put("motivocancelacionIdVenda", Arrays.asList(Constantes.MVO_CANCEL_CANCELACION,Constantes.MVO_CANCEL_DEVOLUCAO,Constantes.MVO_CANCEL_TROCA,Constantes.MVO_CANCEL_CHECKIN,Constantes.MVO_CANCEL_TRANSFERENCIA,Constantes.MVO_CANCEL_BOLETO_ENTREGADO));			
-			parametros.put("motivocancelacionId", Arrays.asList(Constantes.MVO_CANCEL_CANCELACION,Constantes.MVO_CANCEL_DEVOLUCAO));
 			
 			if(parametros.containsKey("empresaId")) {
 				sQuery.append("AND B.EMPRESACORRIDA_ID = :empresaId ");
@@ -891,10 +880,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			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 ")
+				  .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 ")
+				  .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) ")
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java b/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java
index 115aada52..5d91d3be0 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java
@@ -3,6 +3,7 @@ package com.rjconsultores.ventaboletos.vo.comissao;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import org.apache.commons.lang.StringUtils;
 import org.zkoss.util.resource.Labels;
 
 import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia;
@@ -34,6 +35,8 @@ public class OcdVO {
 	private Integer usuarioId;
 	private Boolean activo;
 	private String nombusuario;
+	private String login;
+	private String numFolioSistema;
 	
 	private Integer status;
 	private Long logconferenciaId;
@@ -219,4 +222,33 @@ public class OcdVO {
 		this.conferido = conferido;
 	}
 
+	public String getLogin() {
+		return login;
+	}
+
+	public void setLogin(String login) {
+		this.login = login;
+	}
+
+	public String getNumFolioSistema() {
+		return numFolioSistema;
+	}
+
+	public void setNumFolioSistema(String numFolioSistema) {
+		this.numFolioSistema = numFolioSistema;
+	}
+	
+	public String getNombusuarioLogin() {
+		StringBuilder nombusuarioLogin = new StringBuilder();
+		
+		nombusuarioLogin.append(StringUtils.isNotBlank(getNombusuario()) ? getNombusuario() : "");
+		
+		if(nombusuarioLogin.length() > 0) {
+			nombusuarioLogin.append(" - ")
+							.append(StringUtils.isNotBlank(getLogin()) ? getLogin() : "");
+		}
+		
+		return nombusuarioLogin.toString();
+	}
+
 }