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

fixes bug #7803 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@58949 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-08-10 16:31:31 +00:00
parent d82f63038a
commit 3c70a69852
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -195,7 +195,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("INNER JOIN PUNTO_VENTA PV ON B.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ")
.append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ")
.append("WHERE PV.ACTIVO = 1 ")
.append("AND B.FECHORVENTA BETWEEN ? AND ? ");
.append("AND B.FECHORVENTA BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') ");
if(parametros.containsKey("empresaId")) {
sQuery.append("AND M.EMPRESA_ID = ? ");
@ -211,8 +211,9 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
stmt = con.prepareStatement(sQuery.toString());
int idxParametro = 1;
stmt.setDate(idxParametro++, new java.sql.Date(((Date)parametros.get("dataInicial")).getTime()));
stmt.setDate(idxParametro++, new java.sql.Date(((Date)parametros.get("dataFinal")).getTime()));
stmt.setString(idxParametro++, DateUtil.getStringDate(DateUtil.inicioFecha((Date)parametros.get("dataInicial")), "dd/MM/yyyy HH:mm"));
stmt.setString(idxParametro++, DateUtil.getStringDate(DateUtil.fimFecha((Date)parametros.get("dataFinal")), "dd/MM/yyyy HH:mm"));
if(parametros.containsKey("empresaId")) {
stmt.setInt(idxParametro++, (Integer) parametros.get("empresaId"));
}