fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
leonardo 2014-07-22 21:48:09 +00:00
parent 89e08ca7b4
commit cd558ad4e2
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
View File

@ -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) {