From 24a7b79f9f8fa9b19010970373ccb6ebd86fe910 Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 12 Jun 2019 21:09:32 +0000 Subject: [PATCH] fixes bug#14644 dev:thiago qua:wallysson git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@94535 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasRequisicao.java | 26 ++++----- .../RelatorioVendasRequisicao.jasper | Bin 36775 -> 36969 bytes .../templates/RelatorioVendasRequisicao.jrxml | 52 ++++++++++-------- .../RelatorioVendasRequisicaoController.java | 9 +-- 4 files changed, 45 insertions(+), 42 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java index 320a8ed18..511e746fd 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java @@ -3,7 +3,6 @@ package com.rjconsultores.ventaboletos.relatorios.impl; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -12,7 +11,6 @@ import org.apache.log4j.Logger; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; -import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasConexaoBean; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasRequisicaoBean; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; @@ -24,8 +22,8 @@ public class RelatorioVendasRequisicao extends Relatorio { private List lsDadosRelatorio; - private Timestamp fecInicio; - private Timestamp fecFinal; + private String fecInicio; + private String fecFinal; private Integer empresaId; private Integer puntoventaId; private Integer secretariaId; @@ -38,8 +36,8 @@ public class RelatorioVendasRequisicao extends Relatorio { @Override public void initDados() throws Exception { Map parametros = this.relatorio.getParametros(); - fecInicio = (Timestamp) parametros.get("dataFiltroInicial"); - fecFinal = (Timestamp) parametros.get("dataFiltroFinal"); + fecInicio = parametros.get("dataFiltroInicial").toString(); + fecFinal = parametros.get("dataFiltroFinal").toString(); if(parametros.get("EMPRESA_ID")!=null){ empresaId = Integer.valueOf(parametros.get("EMPRESA_ID").toString()); } @@ -125,10 +123,10 @@ public class RelatorioVendasRequisicao extends Relatorio { NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); if(fecInicio != null) { - stmt.setTimestamp("fecInicio", fecInicio); + stmt.setString("fecInicio", fecInicio); } if(fecFinal != null) { - stmt.setTimestamp("fecFinal", fecFinal); + stmt.setString("fecFinal", fecFinal); } if(empresaId != null) { stmt.setInt("EMPRESA_ID", empresaId); @@ -150,20 +148,22 @@ public class RelatorioVendasRequisicao extends Relatorio { .append("FROM CAJA C ") .append("JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ") .append("JOIN PARADA DES ON DES.PARADA_ID = C.DESTINO_ID ") - .append("JOIN CAJA_FORMAPAGO CFP ON CFP.CAJA_ID = C.CAJA_ID ") - .append("LEFT JOIN CAJA_DET_PAGO CDP ON CDP.CAJAFORMAPAGO_ID = CFP.CAJAFORMAPAGO_ID ") + .append("JOIN CAJA_FORMAPAGO CFP ON CFP.CAJA_ID = C.CAJA_ID AND CFP.ACTIVO = 1 ") + .append("LEFT JOIN CAJA_DET_PAGO CDP ON CDP.CAJAFORMAPAGO_ID = CFP.CAJAFORMAPAGO_ID AND CDP.ACTIVO = 1 ") .append("JOIN SECRETARIA SEC ON CDP.OPCIONAL1 = SEC.SECRETARIA_ID ") .append("JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = CFP.FORMAPAGO_ID ") .append("JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ") .append("JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ") .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") - .append("WHERE FP.FORMAPAGO_ID = 11 "); + .append("WHERE FP.FORMAPAGO_ID = 11 ") + .append("AND C.ACTIVO = 1 ") + .append("AND C.INDREIMPRESION = 0 "); if(fecInicio != null) { - sQuery.append("AND NVL(C.FECHORVENTA_H,C.FECHORVENTA) >= :fecInicio "); + sQuery.append("AND NVL(C.FECHORVENTA_H,C.FECHORVENTA) >= TO_DATE(:fecInicio, 'dd/mm/yyyy hh24:mi') "); } if(fecFinal != null) { - sQuery.append("AND NVL(C.FECHORVENTA_H,C.FECHORVENTA) <= :fecFinal "); + sQuery.append("AND NVL(C.FECHORVENTA_H,C.FECHORVENTA) <= TO_DATE(:fecFinal, 'dd/mm/yyyy hh24:mi') "); } if(empresaId != null) { sQuery.append("AND E.EMPRESA_ID = :EMPRESA_ID "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasRequisicao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasRequisicao.jasper index a5eafb8ecfb40e639e3220ae24112168c7465317..f63f785c07ab9bcda0117d92358fcf2615d28839 100644 GIT binary patch delta 5328 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 - - + +