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

fixes bug#20847 

dev:alberto
qua:wallysson

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@104143 d1611594-4594-4d17-8e1d-87c2c4800839
master
changelogweb 2020-11-04 23:40:01 +00:00
parent fb9e468d5c
commit 09f50060ff
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
View File

@ -114,8 +114,15 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
else
stmt.setNull("TIPOPTOVTA_ID", java.sql.Types.INTEGER);
stmt.setDate("DATA_INICIO", (java.sql.Date) parametros.get("DATA_INICIO"));
stmt.setDate("DATA_FINAL", (java.sql.Date) parametros.get("DATA_FINAL"));
if ((Boolean) parametros.get("B_DATA_FECHAMENTO")){
stmt.setDate("DATA_INICIO", new java.sql.Date(((java.util.Date) parametros.get("DATA_INICIO")).getTime()));
stmt.setDate("DATA_FINAL", new java.sql.Date(((java.util.Date) parametros.get("DATA_FINAL")).getTime()));
}else{
stmt.setTimestamp("DATA_INICIO", new java.sql.Timestamp(((java.util.Date) parametros.get("DATA_INICIO")).getTime()));
stmt.setTimestamp("DATA_FINAL", new java.sql.Timestamp(((java.util.Date) parametros.get("DATA_FINAL")).getTime()));
}
stmt.setString("ISNUMPUNTOVENTATODOS", (String) parametros.get("ISNUMPUNTOVENTATODOS"));
@ -583,8 +590,8 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
NamedParameterStatement stmt = new NamedParameterStatement(this.getConexao(), sql.toString());
stmt.setInt("PUNTOVENTA_ID", puntoVentaId);
stmt.setInt("EMPRESA_ID", empresaId);
stmt.setDate("DATA_INICIO", (java.sql.Date) this.getParametros().get("DATA_INICIO"));
stmt.setDate("DATA_FINAL", (java.sql.Date) this.getParametros().get("DATA_FINAL"));
stmt.setDate("DATA_INICIO", new java.sql.Date(((java.util.Date) this.getParametros().get("DATA_INICIO")).getTime()));
stmt.setDate("DATA_FINAL", new java.sql.Date(((java.util.Date) this.getParametros().get("DATA_FINAL")).getTime()));
ResultSet rs = stmt.executeQuery();
if (rs.next()) {
@ -615,8 +622,9 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
NamedParameterStatement stmt = new NamedParameterStatement(this.getConexao(), sql.toString());
stmt.setInt("PUNTOVENTA_ID", puntoVentaId);
stmt.setDate("DATA_INICIO", (java.sql.Date) this.getParametros().get("DATA_INICIO"));
stmt.setDate("DATA_FINAL", (java.sql.Date) this.getParametros().get("DATA_FINAL"));
stmt.setDate("DATA_INICIO", new java.sql.Date(((java.util.Date) this.getParametros().get("DATA_INICIO")).getTime()));
stmt.setDate("DATA_FINAL", new java.sql.Date(((java.util.Date) this.getParametros().get("DATA_FINAL")).getTime()));
ResultSet rs = stmt.executeQuery();
if (rs.next()) {
@ -712,7 +720,7 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
if ((Boolean) this.getParametros().get("B_DATA_FECHAMENTO")){
sql.append(" AND CJ.FECCORTE BETWEEN :DATA_INICIO AND :DATA_FINAL ");
}else{
sql.append(" AND CJ.FECHORVENTA BETWEEN :DATA_INICIO AND :DATA_FINAL ");
sql.append(" AND CJ.FECHORVENTA BETWEEN cast(:DATA_INICIO as DATE) AND cast(:DATA_FINAL AS DATE) ");
}
sql.append(" AND CJ.ACTIVO = 1 ");

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java
View File

@ -316,8 +316,8 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom
Map<String, Object> parametros = new HashMap<String, Object>();
StringBuilder filtro = new StringBuilder();
parametros.put("DATA_INICIO", new java.sql.Date(((java.util.Date) DateUtil.inicioFecha(this.datInicial.getValue())).getTime()));
parametros.put("DATA_FINAL", new java.sql.Date(((java.util.Date) DateUtil.fimFecha(this.datFinal.getValue())).getTime()));
parametros.put("DATA_INICIO", DateUtil.inicioFecha(this.datInicial.getValue()));
parametros.put("DATA_FINAL", DateUtil.fimFecha(this.datFinal.getValue()));
parametros.put("B_EXCLUI_BAGAGEM", chkExcessoBagagem.isChecked());
parametros.put("B_CONTEMPLAR_GAP", chkContemplarGap.isChecked());
parametros.put("B_DATA_FECHAMENTO", radDataFechamento.isChecked());