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

fixed bug #9746 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@73363 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2017-08-31 13:31:30 +00:00
parent 5efce21efa
commit 82eb9ac37d
1 changed files with 220 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java
View File

@ -277,7 +277,9 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO<Pacote,
count = 0;
for (HashMap<String, Object> s : secondResult) {
if (cajaDiversosId.equals(s.get("CAJADIVERSOS_ID"))) {
if (firstResult.get(cajaDiversosId).size() < count) {
firstResult.get(cajaDiversosId).get(count).putAll(s);
}
count++;
}
}
@ -355,6 +357,7 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO<Pacote,
/**
* Adiciona os filtros na query
*
* @param query
* @param fecInicial
* @param fecFinal
@ -427,7 +430,6 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO<Pacote,
return TipoFormapago.RESERVA.equals(pagamento.getTipoFormapago());
}
@SuppressWarnings("unchecked")
private void carregarDadosServico(List<PacoteVO> pacotes, Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal, Date fecAlteracaoInicial, Date fecAlteracaoFinal) {
StringBuilder sQuery = new StringBuilder();