fixes bug #7185
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@53426 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
d8d653d509
commit
dd35b3e6e1
|
@ -338,8 +338,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
||||||
cal.set(Calendar.MONTH, Integer.valueOf(vetCompetencia[0]) - 1);
|
cal.set(Calendar.MONTH, Integer.valueOf(vetCompetencia[0]) - 1);
|
||||||
cal.set(Calendar.YEAR, Integer.valueOf(vetCompetencia[1]));
|
cal.set(Calendar.YEAR, Integer.valueOf(vetCompetencia[1]));
|
||||||
|
|
||||||
parametros.put("dataInicial", DateUtil.getDateFromString(cal.getActualMinimum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy"));
|
parametros.put("dataInicial", DateUtil.getDateFromString(cal.getActualMinimum(Calendar.DAY_OF_MONTH) + "/" + competencia + " 00:00:00", "dd/MM/yyyy hh:mm:ss"));
|
||||||
parametros.put("dataFinal", DateUtil.getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy"));
|
parametros.put("dataFinal", DateUtil.getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia + " 23:59:59", "dd/MM/yyyy hh:mm:ss"));
|
||||||
}
|
}
|
||||||
|
|
||||||
return parametros;
|
return parametros;
|
||||||
|
|
Loading…
Reference in New Issue