From 2e01278bfbe577d9091a468f9fbd988d99767196 Mon Sep 17 00:00:00 2001
From: celio <celio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 30 Sep 2021 18:43:06 +0000
Subject: [PATCH] fixes bug#23120 dev: WALLACE qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@108930 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ConferenciaComissaoHibernateDAO.java      | 10 ++---
 .../vo/comissao/EventosFinanceirosVO.java     | 40 +++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 12113ef23..87e65da6e 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -638,7 +638,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("LEFT JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
 					.append("LEFT JOIN EMPRESA_IMPOSTO EI ON (EI.ESTADO_ID = EST.ESTADO_ID AND EI.EMPRESA_ID = E.EMPRESA_ID AND EI.ACTIVO = 1) ")
 					.append("WHERE EE.ACTIVO = 1 ")
-					.append("AND CD.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') ");
+					.append("AND CD.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') AND ee.eventoextra_id = 100245109 ");
 
 			if (parametros.containsKey("empresaId")) {
 				sQuery.append("AND EE.EMPRESA_ID = :empresaId ");
@@ -655,9 +655,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			
 			List<EventosFinanceirosVO> result = new ArrayList<EventosFinanceirosVO>();
 			while(rSet.next()) {
-				EventosFinanceirosVO eventosFinanceiros = new EventosFinanceirosVO();
+				EventosFinanceirosVO eventosFinanceiros = new EventosFinanceirosVO(rSet.getLong("eventoextraId"), rSet.getLong("logconferenciaId") > 0 ? rSet.getLong("logconferenciaId") : 0);
 				eventosFinanceiros.setBoletoId(rSet.getLong("boletoId") > 0 ? rSet.getLong("boletoId") : null);
-				eventosFinanceiros.setEventoextraId(rSet.getLong("eventoextraId"));
 				eventosFinanceiros.setNumdocumento(rSet.getString("numdocumento"));
 				eventosFinanceiros.setImpingreso(rSet.getBigDecimal("impingreso"));
 				eventosFinanceiros.setDesctipoevento(rSet.getString("desctipoevento"));
@@ -670,7 +669,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				eventosFinanceiros.setTipoeventoextradebcred(rSet.getInt("tipoeventoextradebcred") > 0 ? rSet.getInt("tipoeventoextradebcred") : null);
 				eventosFinanceiros.setIndtipo(rSet.getString("indtipo"));
 				eventosFinanceiros.setNombusuario(rSet.getString("nombusuario"));
-				eventosFinanceiros.setLogconferenciaId(rSet.getLong("logconferenciaId") > 0 ? rSet.getLong("logconferenciaId") : null);
 				eventosFinanceiros.setExigeConferenciaAba(rSet.getBoolean("exigeConferenciaAba"));
 				eventosFinanceiros.setNumFolioSistema(rSet.getString("numFolioSistema"));
 				eventosFinanceiros.setCvetipoevento(rSet.getString("cvetipoevento"));
@@ -682,8 +680,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				eventosFinanceiros.setTurnoId(rSet.getInt("turnoId"));
 				
 				eventosFinanceiros.setConferencia(conferencia);
+				if (!result.contains(eventosFinanceiros)) {
+					result.add(eventosFinanceiros);
+				}
 				
-				result.add(eventosFinanceiros);
 			}
 
 			return result;
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java b/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java
index df1da3929..6766337f2 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java
@@ -50,6 +50,15 @@ public class EventosFinanceirosVO {
 	private Integer usuarioId;
 	private Integer turnoId;
 	
+	public EventosFinanceirosVO(Long eventoextraId, Long logconferenciaId) {
+		this.eventoextraId = eventoextraId;
+		this.logconferenciaId = logconferenciaId;
+	}
+	
+	public EventosFinanceirosVO() {
+		
+	}
+	
 	public Long getEventoextraId() {
 		return eventoextraId;
 	}
@@ -325,5 +334,36 @@ public class EventosFinanceirosVO {
 	public void setTurnoId(Integer turnoId) {
 		this.turnoId = turnoId;
 	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((eventoextraId == null) ? 0 : eventoextraId.hashCode());
+		result = prime * result + ((logconferenciaId == null) ? 0 : logconferenciaId.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		EventosFinanceirosVO other = (EventosFinanceirosVO) obj;
+		if (eventoextraId == null) {
+			if (other.eventoextraId != null)
+				return false;
+		} else if (!eventoextraId.equals(other.eventoextraId))
+			return false;
+		if (logconferenciaId == null) {
+			if (other.logconferenciaId != null)
+				return false;
+		} else if (!logconferenciaId.equals(other.logconferenciaId))
+			return false;
+		return true;
+	}
 	
 }