From 6671521bd115d93eb2b818e428005b130eb5c39c Mon Sep 17 00:00:00 2001
From: valdir <valdir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 29 Oct 2021 13:41:35 +0000
Subject: [PATCH] =?UTF-8?q?0023469:=20Adamantina=20-=20GLPI=20-=2042846=20?=
 =?UTF-8?q?Presta=C3=A7=C3=A3o=20de=20contas=20-=20conferencia=20de=20movi?=
 =?UTF-8?q?mento=20bug#23469=20dev:wallace=20qua:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 92c5b7ab9..b8990c407 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -282,6 +282,23 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			if (parametros.containsKey("puntoventaId")) {
 				sQuery.append("AND PV.PUNTOVENTA_ID = ? ");
 			}
+			
+			sQuery.append(" UNION ")
+				  .append(" SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ")
+				  .append(" PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(C.FECCORTE, 'DD/MM/YY') as \"datamovimento\" ")
+				  .append(" FROM EVENTO_EXTRA ee ")
+				  .append(" INNER JOIN CAJA_DIVERSOS C ON C.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID ")
+				  .append(" INNER JOIN punto_venta  pv ON ee.puntoventa_id = pv.puntoventa_id ")
+				  .append(" WHERE ee.activo = 1")
+				  .append(" AND C.FECCORTE BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') ");
+		 
+			if (parametros.containsKey("empresaId")) {
+				sQuery.append("AND ee.EMPRESA_ID = ? ");
+			}
+			
+			if (parametros.containsKey("puntoventaId")) {
+				sQuery.append("AND PV.PUNTOVENTA_ID = ? ");
+			}  
 
 			sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(C.FECCORTE, 'DD/MM/YY') ");
 
@@ -298,6 +315,18 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			if (parametros.containsKey("puntoventaId") && ((Integer)parametros.get("puntoventaId")) != -1) {
 				stmt.setInt(idxParametro++, (Integer) parametros.get("puntoventaId"));
 			}
+			
+			//Parametros Evento extra
+			stmt.setString(idxParametro++, dataIncial);
+			stmt.setString(idxParametro++, dataFinal);
+			
+			if (parametros.containsKey("empresaId")) {
+				stmt.setInt(idxParametro++, (Integer) parametros.get("empresaId"));
+			}
+			
+			if (parametros.containsKey("puntoventaId") && ((Integer)parametros.get("puntoventaId")) != -1) {
+				stmt.setInt(idxParametro++, (Integer) parametros.get("puntoventaId"));
+			}
 
 			rset = stmt.executeQuery();
 			List<ConferenciaComissaoVO> movimentos = new ArrayList<ConferenciaComissaoVO>();
@@ -797,6 +826,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 	@Transactional
 	public void borrarLogConferencia(LogConferencia logConferencia) throws BusinessException {
 		try {
+			if(logConferencia == null) {
+				return;
+			}
+			
 			if (logConferencia.getContaCorrentePtoVta() != null) {
 				ContaCorrentePtoVta contaCorrentePtoVta = logConferencia.getContaCorrentePtoVta();
 				contaCorrentePtoVta.setActivo(Boolean.FALSE);