From 4ec97ef2a4a4ec1034df4f79a9dd54afb2755c57 Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 27 Sep 2017 19:21:40 +0000
Subject: [PATCH] fixes bug#9888

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@74292 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/dao/ConferenciaComissaoDAO.java          | 2 +-
 .../dao/hibernate/ConferenciaComissaoHibernateDAO.java    | 8 ++++++--
 .../service/impl/CalculoComissaoServiceImpl.java          | 2 +-
 .../service/impl/ConferenciaComissaoServiceImpl.java      | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java b/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
index 427cfd410..4f9b4e59f 100644
--- a/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
@@ -38,7 +38,7 @@ public interface ConferenciaComissaoDAO extends GenericDAO<Conferencia, Long> {
 	
 	public LogConferencia obtenerLogConferenciaID(Long logconferenciaId);
 	
-	public List<BoletoComissao> carregarBilhetesComissao(Conferencia conferencia) throws BusinessException;
+	public List<BoletoComissao> carregarBilhetesComissao(Conferencia conferencia, boolean ehConsultaComissao) throws BusinessException;
 	
 	public List<OcdVO> carregarOcds(Conferencia conferencia) throws BusinessException;
 
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index ee5f4a7c9..746eb4c02 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -798,7 +798,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public List<BoletoComissao> carregarBilhetesComissao(Conferencia conferencia)
+	public List<BoletoComissao> carregarBilhetesComissao(Conferencia conferencia, boolean ehConsultaComissao)
 			throws BusinessException {
 		try {
 			Map<String, Object> parametros = carregarParametros(null, null, conferencia.getCompetencia(), conferencia.getEmpresa(),
@@ -842,7 +842,11 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				sQuery.append("AND M.EMPRESA_ID = :empresaId ");
 			}
 			if (parametros.containsKey("puntoventaId")) {
-				sQuery.append("AND (C.PUNTOVENTA_ID = :puntoventaId or (C.ptovtaventa_id =:puntoventaId and C.MOTIVOCANCELACION_ID  IN (32,31,10) AND C.INDSTATUSOPERACION  = 'F' )  )");
+				if (ehConsultaComissao){
+					sQuery.append("AND (C.PUNTOVENTA_ID = :puntoventaId or (C.ptovtaventa_id =:puntoventaId and C.MOTIVOCANCELACION_ID  IN (32,31,10) AND C.INDSTATUSOPERACION  = 'F' )  )");
+				}else{
+					sQuery.append("AND C.PUNTOVENTA_ID = :puntoventaId ");
+				}
 			}
 			if (StringUtils.isNotBlank(conferencia.getNumfoliosistema())) {
 				sQuery.append("AND C.NUMFOLIOSISTEMA = :numfoliosistema ");
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
index 2712f63c9..8242ac00f 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
@@ -309,7 +309,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
 			conferencia.setPuntoVenta(new PuntoVenta(puntoVentaId));
 			conferencia.setEmpresa(new Empresa(empresaId));
 			conferencia.setCompetencia(DateUtil.getStringDate(periodo, "MM/yyyy"));
-			List<BoletoComissao> receitasBoleto = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia);
+			List<BoletoComissao> receitasBoleto = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia, true);
 			List<EventosFinanceirosVO> eventosFinanceirosVOs = conferenciaComissaoDAO.carregarEventosFinanceiros(conferencia);
 
 			Calendar calendario = Calendar.getInstance();
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
index 8ef147481..dddd82003 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
@@ -192,7 +192,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 			}
 
 			if (boletoComissaos == null || boletoComissaos.isEmpty()) {
-				boletoComissaos = conferenciaComissaoDAO.carregarBilhetesComissao(c);
+				boletoComissaos = conferenciaComissaoDAO.carregarBilhetesComissao(c, false);
 			}
 			
 			if(boletoStatusComissao == null){
@@ -242,7 +242,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
 	@Override
 	public List<BoletoComissao> carregarBilhetesComissao(List<BoletoComissao> boletoComissaos, Conferencia conferencia, BoletoStatusComissao boletoStatusComissao, boolean carregarDadosFaltantes) throws BusinessException {
 		if (boletoComissaos == null) {
-			boletoComissaos = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia);
+			boletoComissaos = conferenciaComissaoDAO.carregarBilhetesComissao(conferencia, false);
 		}
 
 		if (boletoStatusComissao == null) {