From 2ca8908ebc55dac33d1514bff905d049f2c4e8ca Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 27 Oct 2017 16:33:08 +0000
Subject: [PATCH] fixes bug #10015

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index dd1b709d9..8b80d2bd2 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -823,13 +823,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID) ")
 					.append("WHERE C.ACTIVO = 1 ")
 					.append("AND C.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') ")
-					.append("AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ");
-
-			if(isCalculoComissao) {
-				sQuery.append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = 99)  ");
-			} else { 
-				sQuery.append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0)  ");
-			}
+					.append("AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ")
+					.append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = :motivoCancelacionGeracaoOcd) ");
 			
 			if (parametros.containsKey("empresaId")) {
 				sQuery.append("AND M.EMPRESA_ID = :empresaId ");
@@ -906,6 +901,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.addScalar("ptoVtaOrigem", Hibernate.BOOLEAN)
 					.addScalar("valorbase", Hibernate.BIG_DECIMAL)
 					.setResultTransformer(Transformers.aliasToBean(BoletoComissao.class));
+			
+			parametros.put("motivoCancelacionGeracaoOcd", Constantes.MVO_CANCEL_GERACAO_OCD.intValue());
 			setParametros(qr, parametros);
 
 			List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>();
@@ -1216,11 +1213,11 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 		sql.append("WHERE c.EMPRESACORRIDA_ID = :empresaId ");
 		sql.append("  AND c.INDSTATUSBOLETO = 'V' ");
 		sql.append("  AND lc.ACTIVO = 1 ");
-		sql.append("  AND c.TRANSACAOORIGINAL_ID =:cajaId ");
+		sql.append("  AND c.TRANSACAOORIGINAL_ID =:transacaoId ");
 		sql.append("  AND c.TIPOVENTA_ID IN (5,12,18,81,41) ");
 
 		Query qr = getSession().createSQLQuery(sql.toString());
-		qr.setParameter("cajaId", boletoComissao.getTransacaoOriginalId());
+		qr.setParameter("transacaoId", boletoComissao.getTransacaoOriginalId());
 		qr.setParameter("empresaId", boletoComissao.getEmpresaId() );
 
 		return !qr.list().isEmpty();