From cd558ad4e2f309e6d0f4701afa3af85640e338f0 Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 22 Jul 2014 21:48:09 +0000
Subject: [PATCH] Ajustar WS Caja (fixed bug #5519)

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@36768 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/CajaHibernateDAO.java        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
index f7b3ad53a..a69351dc7 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
@@ -1,6 +1,9 @@
 package com.rjconsultores.ventaboletos.dao.hibernate;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 import org.hibernate.SQLQuery;
@@ -37,6 +40,9 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
 	
 	@Override
 	public List<CajaVO> buscarCajaFecha(boolean yaCerrado, Date fechaDesde, Date fechaHasta) {
+		List<CajaVO> list = new ArrayList<CajaVO>();
+		HashMap<Long, CajaVO> map = new HashMap<Long, CajaVO>();
+		
 		String sqlBuscarCajaFecha = sqlBuilder.getSQLBuscarCajaFecha(yaCerrado, fechaDesde, fechaHasta);
 		SQLQuery sql = getSession().createSQLQuery(sqlBuscarCajaFecha)
 				.addScalar("cajaId", LongType.INSTANCE)
@@ -75,7 +81,17 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
 
 		sql.setResultTransformer(new AliasToBeanResultTransformer(CajaVO.class));
 
-		return sql.list();
+		for (CajaVO cv : (List<CajaVO>)sql.list()){
+			if (map.containsKey(cv.getCajaId()) && map.get(cv.getCajaId()).getImporteTaxaEmbarque() != null &&
+					!map.get(cv.getCajaId()).getImporteTaxaEmbarque().equals(0)){
+				cv.setImporteTaxaEmbarque(new BigDecimal(0));
+			} else {
+				map.put(cv.getCajaId(), cv);
+			}
+			list.add(cv);
+		}
+		
+		return list;
 	}
 	
 	public List<UsuarioVO> buscarCajaCerrado(Date fecha, String cveusuario, String turnoid) {