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

Merge pull request 'fixes bug#AL-2437' (!50) from AL-2437 into master 

Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/50
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
Gleison da Cruz 2023-05-11 12:00:42 +00:00
parent 24dbd2f3f4 c57e2f68b6
commit e593f2f86a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.3.0</version> <version>1.3.1</version>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>rj-releases</id> <id>rj-releases</id>

8
src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java
View File

@ -303,22 +303,22 @@ public class ReceitaDespesaHibernateDAO implements ReceitaDespesaDAO {
if(isDataFechamentoCaixa) { if(isDataFechamentoCaixa) {
if(parametros.containsKey("fecInicio")) { if(parametros.containsKey("fecInicio")) {
sql.append("AND C.FECCORTE >= TO_DATE(:fecInicio,'DD/MM/YYYY HH24:MI') "); sql.append("AND C.FECCORTE >= TO_DATE(:fecInicio,'DD/MM/YYYY HH24:MI:SS') ");
parametrosFiltro.put("fecInicio", parametros.get("fecInicio")); parametrosFiltro.put("fecInicio", parametros.get("fecInicio"));
} }
if(parametros.containsKey("fecFinal")) { if(parametros.containsKey("fecFinal")) {
sql.append("AND C.FECCORTE <= TO_DATE(:fecFinal,'DD/MM/YYYY HH24:MI') "); sql.append("AND C.FECCORTE <= TO_DATE(:fecFinal,'DD/MM/YYYY HH24:MI:SS') ");
parametrosFiltro.put("fecFinal", parametros.get("fecFinal")); parametrosFiltro.put("fecFinal", parametros.get("fecFinal"));
} }
} else { } else {
if(parametros.containsKey("fecInicio")) { if(parametros.containsKey("fecInicio")) {
sql.append("AND C.FECHORVTA >= TO_DATE(:fecInicio,'DD/MM/YYYY HH24:MI') "); sql.append("AND C.FECHORVTA >= TO_DATE(:fecInicio,'DD/MM/YYYY HH24:MI:SS') ");
parametrosFiltro.put("fecInicio", parametros.get("fecInicio")); parametrosFiltro.put("fecInicio", parametros.get("fecInicio"));
} }
if(parametros.containsKey("fecFinal")) { if(parametros.containsKey("fecFinal")) {
sql.append("AND C.FECHORVTA <= TO_DATE(:fecFinal,'DD/MM/YYYY HH24:MI') "); sql.append("AND C.FECHORVTA <= TO_DATE(:fecFinal,'DD/MM/YYYY HH24:MI:SS') ");
parametrosFiltro.put("fecFinal", parametros.get("fecFinal")); parametrosFiltro.put("fecFinal", parametros.get("fecFinal"));
} }
} }