From aeb89098b7bfa6a45ff41ab2a7f124c3d90d9651 Mon Sep 17 00:00:00 2001 From: edgar Date: Fri, 7 Oct 2016 14:33:17 +0000 Subject: [PATCH] bug fix #8022 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@61343 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDepositosDetalhado.java | 166 +++++++++--------- .../RelatorioDepositosDetalhado_es.properties | 3 +- ...latorioDepositosDetalhado_pt_BR.properties | 3 +- .../RelatorioDepositosDetalhado.jasper | Bin 34206 -> 34556 bytes .../RelatorioDepositosDetalhado.jrxml | 93 ++++++---- .../RelatorioDepositosDetalhadosBean.java | 48 +++-- 6 files changed, 181 insertions(+), 132 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java index 05b36c892..f7a85024c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java @@ -25,19 +25,19 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; * */ public class RelatorioDepositosDetalhado extends Relatorio { - + private static Logger log = Logger.getLogger(RelatorioDepositosDetalhado.class); private List lsDadosRelatorio; - + private Timestamp fecInicio; private Timestamp fecFinal; private Integer marcaId; private Integer instFinanceira; - + public RelatorioDepositosDetalhado(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); - + this.setCustomDataSource(new DataSource(this) { @Override @@ -45,13 +45,13 @@ public class RelatorioDepositosDetalhado extends Relatorio { Map parametros = this.relatorio.getParametros(); fecInicio = (Timestamp) parametros.get("dataFiltroInicial"); fecFinal = (Timestamp) parametros.get("dataFiltroFinal"); - if(parametros.get("MARCA_ID")!=null){ - marcaId = Integer.valueOf(parametros.get("MARCA_ID").toString()); + if (parametros.get("MARCA_ID") != null) { + marcaId = Integer.valueOf(parametros.get("MARCA_ID").toString()); } - if(parametros.get("INST_FINANCEIRA")!=null){ - instFinanceira = Integer.valueOf(parametros.get("INST_FINANCEIRA").toString()); + if (parametros.get("INST_FINANCEIRA") != null) { + instFinanceira = Integer.valueOf(parametros.get("INST_FINANCEIRA").toString()); } - + Connection conexao = this.relatorio.getConexao(); processarDepositosDetalhados(conexao); setLsDadosRelatorio(lsDadosRelatorio); @@ -59,17 +59,18 @@ public class RelatorioDepositosDetalhado extends Relatorio { }); } + public void setLsDadosRelatorio(List lsDadosRelatorio) { this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio)); this.lsDadosRelatorio = lsDadosRelatorio; } - + private void processarDepositosDetalhados(Connection conexao) { ResultSet rset = null; NamedParameterStatement stmt = null; - + try { - if(lsDadosRelatorio == null) { + if (lsDadosRelatorio == null) { lsDadosRelatorio = new ArrayList(); } @@ -82,30 +83,30 @@ public class RelatorioDepositosDetalhado extends Relatorio { } catch (Exception e) { log.error(e.getMessage(), e); } - + } + private NamedParameterStatement carregarNamedParameterStatement(Connection conexao) throws SQLException { String sql = getSqlPacotes(); log.info(sql); - + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); - - if(fecInicio != null) { + + if (fecInicio != null) { stmt.setTimestamp("fecInicio", fecInicio); } - if(fecFinal != null) { + if (fecFinal != null) { stmt.setTimestamp("fecFinal", fecFinal); } - if(marcaId != null){ + if (marcaId != null) { stmt.setInt("MARCA_ID", marcaId); } - if(instFinanceira != null){ + if (instFinanceira != null) { stmt.setInt("INST_FINANCEIRA", instFinanceira); } - return stmt; } - + private void processarResultado(ResultSet rset) throws SQLException { while (rset.next()) { RelatorioDepositosDetalhadosBean relatorioDepositosDetalhadosBean = new RelatorioDepositosDetalhadosBean(); @@ -113,7 +114,8 @@ public class RelatorioDepositosDetalhado extends Relatorio { relatorioDepositosDetalhadosBean.setNombPuntoVenta(rset.getString("Ponto_de_venda")); relatorioDepositosDetalhadosBean.setBanco(rset.getString("Banco")); relatorioDepositosDetalhadosBean.setFechaDeposito(rset.getString("data_deposito")); - relatorioDepositosDetalhadosBean.setFechaLancamientoDeposito(rset.getString("DATA_LANCAMENTO_DEPOSITO")); + relatorioDepositosDetalhadosBean.setFechaMovimiento(rset.getString("data_movimento")); + relatorioDepositosDetalhadosBean.setFechaInclusion(rset.getString("data_inclusao")); relatorioDepositosDetalhadosBean.setNumAgencia(rset.getString("Agencia")); relatorioDepositosDetalhadosBean.setNumConta(rset.getString("Conta")); relatorioDepositosDetalhadosBean.setNumDeposito(rset.getString("Numero_deposito")); @@ -121,93 +123,97 @@ public class RelatorioDepositosDetalhado extends Relatorio { lsDadosRelatorio.add(relatorioDepositosDetalhadosBean); } } + protected String getSqlPacotes() { StringBuilder sQuery = new StringBuilder(); - + sQuery.append(" SELECT "); sQuery.append(" fd.FECHAMENTODEPOSITO_ID, "); - sQuery.append(" E.NOMBEMPRESA Empresa, "); - sQuery.append(" PV.NOMBPUNTOVENTA Ponto_de_venda, "); - sQuery.append(" TO_CHAR(FD.FECHA_DEPOSITO,'dd/MM/yyyy') data_deposito, "); - sQuery.append(" FD.NUMDEPOSITO Numero_deposito, "); - sQuery.append(" TO_CHAR(FD.FECCREACION,'dd/MM/yyyy') DATA_LANCAMENTO_DEPOSITO, "); - sQuery.append(" if.NOME Banco, "); - sQuery.append(" EC.NUMCONTA Conta, "); - sQuery.append(" EC.NUMAGENCIA Agencia, "); - sQuery.append(" FD.VALOR valor_deposito "); - sQuery.append(" FROM "); - sQuery.append(" FECHAMENTO_DEPOSITO fd "); - sQuery.append(" JOIN FECHAMENTO_CCT_DEPOSITO fcd "); - sQuery.append(" ON "); - sQuery.append(" FCD.FECHAMENTODEPOSITO_ID = FD.FECHAMENTODEPOSITO_ID "); - sQuery.append(" JOIN FECHAMENTO_CNTCORRENTE fc "); - sQuery.append(" ON "); - sQuery.append(" FCD.FECHAMENTOCNTCORRENTE_ID = FC.FECHAMENTOCNTCORRENTE_ID "); - sQuery.append(" JOIN EMPRESA e "); - sQuery.append(" ON "); - sQuery.append(" E.EMPRESA_ID = FC.EMPRESA_ID "); - sQuery.append(" JOIN PUNTO_VENTA pv "); - sQuery.append(" ON "); + sQuery.append(" E.NOMBEMPRESA Empresa, "); + sQuery.append(" PV.NOMBPUNTOVENTA Ponto_de_venda, "); + sQuery.append(" FD.NUMDEPOSITO Numero_deposito, "); + sQuery.append(" TO_CHAR(FD.FECHA_DEPOSITO, 'dd/MM/yyyy') data_deposito, "); + sQuery.append(" TO_CHAR(FC.FECFECHAMENTO, 'dd/MM/yyyy') data_movimento, "); + sQuery.append(" TO_CHAR(FD.FECCREACION, 'dd/MM/yyyy') data_inclusao, "); + sQuery.append(" if.NOME Banco, "); + sQuery.append(" EC.NUMCONTA Conta, "); + sQuery.append(" EC.NUMAGENCIA Agencia, "); + sQuery.append(" FD.VALOR valor_deposito "); + sQuery.append(" FROM "); + sQuery.append(" FECHAMENTO_DEPOSITO fd "); + sQuery.append(" JOIN FECHAMENTO_CCT_DEPOSITO fcd "); + sQuery.append(" ON "); + sQuery.append(" FCD.FECHAMENTODEPOSITO_ID = FD.FECHAMENTODEPOSITO_ID "); + sQuery.append(" JOIN FECHAMENTO_CNTCORRENTE fc "); + sQuery.append(" ON "); + sQuery.append(" FCD.FECHAMENTOCNTCORRENTE_ID = FC.FECHAMENTOCNTCORRENTE_ID "); + sQuery.append(" JOIN EMPRESA e "); + sQuery.append(" ON "); + sQuery.append(" E.EMPRESA_ID = FC.EMPRESA_ID "); + sQuery.append(" JOIN PUNTO_VENTA pv "); + sQuery.append(" ON "); sQuery.append(" PV.PUNTOVENTA_ID = FC.PUNTOVENTA_ID "); - sQuery.append(" JOIN EMPRESA_CONTABANCARIA ec "); + sQuery.append(" JOIN EMPRESA_CONTABANCARIA ec "); sQuery.append(" ON "); sQuery.append(" fd.EMPRESACONTABANCARIA_ID = EC.EMPRESACONTABANCARIA_ID "); - sQuery.append(" JOIN INSTI_FINANCEIRA IF "); - sQuery.append(" ON "); - sQuery.append(" EC.INSTIFINANCEIRA_ID = if.INSTIFINANCEIRA_ID "); - sQuery.append(" "); - sQuery.append(" WHERE "); - sQuery.append(" FD.ACTIVO = 1 "); - sQuery.append(" AND FCD.ACTIVO = 1 "); - sQuery.append(" AND FC.ACTIVO = 1 "); - sQuery.append(" AND E.ACTIVO = 1 "); - sQuery.append(" AND PV.ACTIVO = 1 "); - if(parametros.get("MARCA_ID")!= null){ + sQuery.append(" JOIN INSTI_FINANCEIRA IF "); + sQuery.append(" ON "); + sQuery.append(" EC.INSTIFINANCEIRA_ID = if.INSTIFINANCEIRA_ID "); + sQuery.append(" "); + sQuery.append(" WHERE "); + sQuery.append(" FD.ACTIVO = 1 "); + sQuery.append(" AND FCD.ACTIVO = 1 "); + sQuery.append(" AND FC.ACTIVO = 1 "); + sQuery.append(" AND E.ACTIVO = 1 "); + sQuery.append(" AND PV.ACTIVO = 1 "); + if (parametros.get("MARCA_ID") != null) { sQuery.append(" and e.empresa_id =:MARCA_ID "); - } - if(parametros.get("INST_FINANCEIRA")!= null){ + } + if (parametros.get("INST_FINANCEIRA") != null) { sQuery.append(" and if.INSTIFINANCEIRA_ID =:INST_FINANCEIRA "); } sQuery.append(" and FD.FECCREACION between :fecInicio and :fecFinal"); - sQuery.append(" GROUP BY "); + sQuery.append(" GROUP BY "); sQuery.append(" fd.FECHAMENTODEPOSITO_ID, "); - sQuery.append(" E.NOMBEMPRESA, "); - sQuery.append(" PV.NOMBPUNTOVENTA, "); - sQuery.append(" FD.FECHA_DEPOSITO, "); - sQuery.append(" FD.NUMDEPOSITO, "); - sQuery.append(" FD.FECCREACION, "); - sQuery.append(" if.NOME, "); - sQuery.append(" EC.NUMCONTA, "); - sQuery.append(" EC.NUMAGENCIA, "); - sQuery.append(" FD.VALOR "); + sQuery.append(" E.NOMBEMPRESA, "); + sQuery.append(" PV.NOMBPUNTOVENTA, "); + sQuery.append(" FD.FECHA_DEPOSITO, "); + sQuery.append(" FD.NUMDEPOSITO, "); + sQuery.append(" FC.FECFECHAMENTO, "); + sQuery.append(" FD.FECCREACION, "); + sQuery.append(" if.NOME, "); + sQuery.append(" EC.NUMCONTA, "); + sQuery.append(" EC.NUMAGENCIA, "); + sQuery.append(" FD.VALOR "); sQuery.append(" ORDER BY "); - sQuery.append(" E.NOMBEMPRESA, "); + sQuery.append(" E.NOMBEMPRESA, "); sQuery.append(" PV.NOMBPUNTOVENTA, "); sQuery.append(" FD.FECCREACION, "); - sQuery.append(" FD.FECHA_DEPOSITO, "); - sQuery.append(" FD.NUMDEPOSITO, "); - sQuery.append(" if.NOME, "); - sQuery.append(" EC.NUMCONTA, "); - sQuery.append(" EC.NUMAGENCIA, "); + sQuery.append(" FD.FECHA_DEPOSITO, "); + sQuery.append(" FD.NUMDEPOSITO, "); + sQuery.append(" if.NOME, "); + sQuery.append(" EC.NUMCONTA, "); + sQuery.append(" EC.NUMAGENCIA, "); sQuery.append(" FD.VALOR "); - return sQuery.toString(); + return sQuery.toString(); } - + private void fecharConexaoBanco(NamedParameterStatement stmt, ResultSet rset) { try { - if(rset != null) { + if (rset != null) { rset.close(); } - if(stmt != null) { + if (stmt != null) { stmt.close(); } } catch (SQLException e) { log.error(e.getMessage(), e); } } + @Override protected void processaParametros() throws Exception { - + } } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_es.properties index 138da0824..b086c03f9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_es.properties @@ -15,7 +15,8 @@ cabecalho.usuario=Usu label.nombPuntoVenta=Punto Venta label.fechaDeposito=Fecha Deposito label.numDeposito=N\u00B0 Deposito -label.fechaLancamientoDeposito=Lanzamiento +label.fechaLancamientoDeposito=Fec. Movimiento +label.fechaInclusion=Fec. Inclusion label.banco=Banco label.numConta=Cuenta label.numAgencia=Agencia diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_pt_BR.properties index a7f7168c5..5332650be 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_pt_BR.properties @@ -15,7 +15,8 @@ cabecalho.usuario=Usu label.nombPuntoVenta=Nome Agência label.fechaDeposito=Data do Dep\u00F3sito label.numDeposito=N\u00B0 do Dep\u00F3sito -label.fechaLancamientoDeposito=Lan\u00E7amento +label.fechaLancamientoDeposito=Dt. Movimento +label.fechaInclusion=Dt. Inclusão label.banco=Banco label.numConta=Conta label.numAgencia=Ag\u00EAncia diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jasper index c6e3f2dea001ce9ee07a32a6a2fafe86d92b17dc..ea9899ab0810e56204970a944b38fccf0ec0af55 100644 GIT binary patch literal 34556 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml index 90b1109aa..86dc4d66b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml @@ -1,6 +1,6 @@ - + @@ -14,12 +14,13 @@ - + + @@ -86,55 +87,73 @@ - + - - + + + + - - + + + + - - + + + + - + + + - + + + - - + + + + - + + + - + + + - - - - - + + + + + + + @@ -145,7 +164,7 @@ - + @@ -155,19 +174,9 @@ - + - - - - - - - - - - - + @@ -179,10 +188,20 @@ - - + + - + + + + + + + + + + + @@ -210,7 +229,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositosDetalhadosBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositosDetalhadosBean.java index 51fda4c83..ed80e6abf 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositosDetalhadosBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositosDetalhadosBean.java @@ -10,81 +10,103 @@ import java.math.BigDecimal; * */ public class RelatorioDepositosDetalhadosBean { - + private String empresa; private String nombPuntoVenta; private String fechaDeposito; private String numDeposito; - private String fechaLancamientoDeposito; + private String fechaMovimiento; + private String fechaInclusion; private String banco; private String numConta; private String numAgencia; private BigDecimal valorDeposito; + /** * @return the empresa */ public String getEmpresa() { return empresa; } + /** - * @param empresa the empresa to set + * @param empresa + * the empresa to set */ public void setEmpresa(String empresa) { this.empresa = empresa; } + public String getNombPuntoVenta() { return nombPuntoVenta; } + public void setNombPuntoVenta(String nombPuntoVenta) { this.nombPuntoVenta = nombPuntoVenta; } + public String getFechaDeposito() { return fechaDeposito; } + public void setFechaDeposito(String fechaDeposito) { this.fechaDeposito = fechaDeposito; } + public String getNumDeposito() { return numDeposito; } + public void setNumDeposito(String numDeposito) { this.numDeposito = numDeposito; } - public String getFechaLancamientoDeposito() { - return fechaLancamientoDeposito; + + public String getFechaMovimiento() { + return fechaMovimiento; } - public void setFechaLancamientoDeposito(String fechaLancamientoDeposito) { - this.fechaLancamientoDeposito = fechaLancamientoDeposito; + + public void setFechaMovimiento(String fechaMovimiento) { + this.fechaMovimiento = fechaMovimiento; } + + public String getFechaInclusion() { + return fechaInclusion; + } + + public void setFechaInclusion(String fechaInclusion) { + this.fechaInclusion = fechaInclusion; + } + public String getBanco() { return banco; } + public void setBanco(String banco) { this.banco = banco; } + public String getNumConta() { return numConta; } + public void setNumConta(String numConta) { this.numConta = numConta; } + public String getNumAgencia() { return numAgencia; } + public void setNumAgencia(String numAgencia) { this.numAgencia = numAgencia; } + public BigDecimal getValorDeposito() { return valorDeposito; } + public void setValorDeposito(BigDecimal valorDeposito) { this.valorDeposito = valorDeposito; } - - - - - - }