From c69855358cf6416a3f2c3cd91301c784d5fd2c1b Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 17 Mar 2022 20:52:03 +0000 Subject: [PATCH] fixes bug#23882 dev: Lucas qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@111371 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasCartoes.java | 115 ++++---- .../RelatorioVendasCartoesAlternativo.java | 240 ++++++++++++++++ ...orioVendasCartoesAlternativo_es.properties | 35 +++ ...oVendasCartoesAlternativo_pt_BR.properties | 35 +++ .../RelatorioVendasCartoesAlternativo.jasper | Bin 0 -> 38071 bytes .../RelatorioVendasCartoesAlternativo.jrxml | 268 ++++++++++++++++++ .../RelatorioVendasCartoesController.java | 88 +++--- .../filtroRelatorioVendasCartoes.zul | 2 + 8 files changed, 683 insertions(+), 100 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoesAlternativo_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoesAlternativo_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoesAlternativo.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoesAlternativo.jrxml diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java index c28b9ee70..873562b5d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java @@ -23,8 +23,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasCartoes extends Relatorio { - - private static Logger log = Logger.getLogger(RelatorioMovimentacaoEstoque.class); + + private static Logger log = Logger.getLogger(RelatorioVendasCartoes.class); List list = null; @@ -36,10 +36,10 @@ public class RelatorioVendasCartoes extends Relatorio { public void initDados() throws Exception { Connection conexao = this.relatorio.getConexao(); Map parametros = this.relatorio.getParametros(); - + NamedParameterStatement stmt = null; ResultSet rset = null; - + String dataInicial = parametros.get("DATA_INICIAL").toString() + " 00:00:00"; String dataFinal = parametros.get("DATA_FINAL").toString() + " 23:59:59"; Empresa empresa = (Empresa) parametros.get("EMPRESA"); @@ -47,28 +47,29 @@ public class RelatorioVendasCartoes extends Relatorio { Usuario usuario = (Usuario) parametros.get("USUARIO"); Estacion estacao = (Estacion) parametros.get("ESTACION"); String tipoAgencias = (String) parametros.get("TIPOPUNTOVENTA"); - + String sql = getSql(dataInicial, dataFinal, empresa, puntoVenta, tipoAgencias, usuario, estacao, buscarPorDataDaVenda); - + log.info("query= " + sql); + try { stmt = new NamedParameterStatement(conexao, sql); - - if(empresa != null){ + + if (empresa != null) { stmt.setInt("empresaId", empresa.getEmpresaId()); } - if(puntoVenta != null){ + if (puntoVenta != null) { stmt.setInt("puntoventaId", puntoVenta.getPuntoventaId()); } - if(dataInicial != null){ - stmt.setString("dataInicial",dataInicial); + if (dataInicial != null) { + stmt.setString("dataInicial", dataInicial); } - if(dataFinal != null){ + if (dataFinal != null) { stmt.setString("dataFinal", dataFinal); } - if(estacao != null){ + if (estacao != null) { stmt.setInt("estacionId", estacao.getEstacionId()); } - if(usuario != null){ + if (usuario != null) { stmt.setInt("usuarioId", usuario.getUsuarioId()); } @@ -77,50 +78,50 @@ public class RelatorioVendasCartoes extends Relatorio { list = new ArrayList(); BigDecimal valorTotal = BigDecimal.ZERO; while (rset.next()) { - + RelatorioVendasCartoesBean bean = new RelatorioVendasCartoesBean(); - + bean.setDataVenda(rset.getDate("dataVenda")); - bean.setDataOperacao(rset.getString("dataOperacao") != null ? DateUtil.getDateFromString(rset.getString("dataOperacao"), "ddMMyy") : null); - bean.setDescPagamento(rset.getString("descPagamento") != null ? rset.getString("descPagamento") : null); - bean.setValor(rset.getBigDecimal("valor") != null ? rset.getBigDecimal("valor") : null); - bean.setAutorizacao(rset.getString("autorizacao") != null ? rset.getString("autorizacao") : null); + bean.setDataOperacao(rset.getString("dataOperacao") != null ? DateUtil.getDateFromString(rset.getString("dataOperacao"), "ddMMyy") : null); + bean.setDescPagamento(rset.getString("descPagamento") != null ? rset.getString("descPagamento") : null); + bean.setValor(rset.getBigDecimal("valor") != null ? rset.getBigDecimal("valor") : null); + bean.setAutorizacao(rset.getString("autorizacao") != null ? rset.getString("autorizacao") : null); bean.setQtdParcelas(rset.getInt("qtdParcelas")); bean.setNumeroPuntoVenta(rset.getInt("numeroPuntoVenta")); - bean.setNomePuntoVenta(rset.getString("nomePuntoVenta") != null ? rset.getString("nomePuntoVenta") : null); - bean.setDescOperadoraCartao(rset.getString("descOperadoraCartao") != null ? rset.getString("descOperadoraCartao") : null); - bean.setNSU(rset.getString("nsu") != null ? rset.getString("nsu") : null); - bean.setNumeroCartao(rset.getString("numeroCartao") != null ? rset.getString("numeroCartao") : null); - bean.setBandeira(rset.getString("bandeira") != null ? rset.getString("bandeira") : null); - bean.setEstabelecimento(rset.getString("estabelecimento") != null ? rset.getString("estabelecimento") : null); - bean.setTerminal(rset.getString("terminal") != null ? rset.getString("terminal") : null); - valorTotal = valorTotal.add(bean.getValor() != null ? bean.getValor() : BigDecimal.ZERO); + bean.setNomePuntoVenta(rset.getString("nomePuntoVenta") != null ? rset.getString("nomePuntoVenta") : null); + bean.setDescOperadoraCartao(rset.getString("descOperadoraCartao") != null ? rset.getString("descOperadoraCartao") : null); + bean.setNSU(rset.getString("nsu") != null ? rset.getString("nsu") : null); + bean.setNumeroCartao(rset.getString("numeroCartao") != null ? rset.getString("numeroCartao") : null); + bean.setBandeira(rset.getString("bandeira") != null ? rset.getString("bandeira") : null); + bean.setEstabelecimento(rset.getString("estabelecimento") != null ? rset.getString("estabelecimento") : null); + bean.setTerminal(rset.getString("terminal") != null ? rset.getString("terminal") : null); + valorTotal = valorTotal.add(bean.getValor() != null ? bean.getValor() : BigDecimal.ZERO); bean.setValorTotal(valorTotal); - + list.add(bean); } } catch (Exception e) { log.error(e.getMessage(), e); } finally { - if(rset != null && !rset.isClosed()) { + if (rset != null && !rset.isClosed()) { rset.close(); } - if(stmt != null && !stmt.isClosed()) { + if (stmt != null && !stmt.isClosed()) { stmt.close(); } } } }); - + this.setCollectionDataSource(new JRBeanCollectionDataSource(list)); } - - private RelatorioVendasCartoesBean calcTotalValor(RelatorioVendasCartoesBean bean) { - BigDecimal valorTotal = bean.getValorTotal().add(bean.getValorTotal()); - bean.setValorTotal(valorTotal); - return bean; - } - + + // private RelatorioVendasCartoesBean calcTotalValor(RelatorioVendasCartoesBean bean) { + // BigDecimal valorTotal = bean.getValorTotal().add(bean.getValorTotal()); + // bean.setValorTotal(valorTotal); + // return bean; + // } + @Override protected void processaParametros() throws Exception { } @@ -128,9 +129,9 @@ public class RelatorioVendasCartoes extends Relatorio { private String getSql(String dataInicial, String dataFinal, Empresa empresa, PuntoVenta puntoVenta, String tipoAgencias, Usuario usuario, Estacion estacion, Boolean buscarPorDataDaVenda) { StringBuilder sb = new StringBuilder(); - + sb.append("SELECT caja.descpago as descPagamento,"); - sb.append(" to_char(caja.dataoperacao, 'ddMMyyyy') as dataOperacao,"); + sb.append(" to_char(caja.dataoperacao, 'ddMMyyyy') as dataOperacao,"); sb.append(" caja.autorizacao as autorizacao,"); sb.append(" coalesce(caja.qtdparcelas, 1) as qtdParcelas ,"); sb.append(" caja.datavenda as dataVenda, "); @@ -150,8 +151,8 @@ public class RelatorioVendasCartoes extends Relatorio { sb.append(" ct.cantparcelas AS qtdparcelas,"); sb.append(" c.fechorventa AS datavenda,"); sb.append(" case when c.motivocancelacion_id is null then cfp.importe else cfp.importe * -1 end AS preco,"); - sb.append(" pt.numpuntoventa as numeroPuntoVenta, "); - sb.append("pt.nombpuntoventa as nomePuntoVenta, "); + sb.append(" pt.numpuntoventa as numeroPuntoVenta, "); + sb.append("pt.nombpuntoventa as nomePuntoVenta, "); sb.append("ct.descoperadoracartao as descoperadoracartao, "); sb.append("ct.nsu as NSU, "); sb.append(" ct.numtarjeta as numeroCartao, "); @@ -169,38 +170,36 @@ public class RelatorioVendasCartoes extends Relatorio { sb.append(" LEFT JOIN estacion_sitef estsitef ON ( estsitef.estacion_id = c.estacion_id and estsitef.activo = 1) "); sb.append(" WHERE c.indreimpresion = 0 "); - if(empresa!= null){ + if (empresa != null) { sb.append("and ma.empresa_id = :empresaId "); } - - if(puntoVenta != null){ + + if (puntoVenta != null) { sb.append("AND c.puntoventa_id = :puntoventaId "); } - - if(estacion!= null){ + + if (estacion != null) { sb.append("AND c.estacion_id = :estacionId "); } - - if(usuario!= null){ + + if (usuario != null) { sb.append(" and c.usuario_id = :usuarioId "); } - - if(dataInicial != null && buscarPorDataDaVenda){ + + if (dataInicial != null && buscarPorDataDaVenda) { sb.append("AND c.fechorventa >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') "); } else if (dataInicial != null && !buscarPorDataDaVenda) { sb.append("AND c.feccorte >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') "); } - - if(dataFinal != null && buscarPorDataDaVenda){ + + if (dataFinal != null && buscarPorDataDaVenda) { sb.append("AND c.fechorventa <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') "); - } else if (dataInicial != null && !buscarPorDataDaVenda) { + } else if (dataInicial != null && !buscarPorDataDaVenda) { sb.append("AND c.feccorte <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') "); } sb.append(tipoAgencias.equals("-1") || tipoAgencias.equals("TODAS") ? "" : " and pt.tipoptovta_id not in (" + tipoAgencias + ") "); - - sb.append(" AND fp.formapago_id IN(2,3)"); sb.append(" AND c.activo = 1) caja "); sb.append("GROUP BY caja.descpago,"); @@ -217,7 +216,7 @@ public class RelatorioVendasCartoes extends Relatorio { sb.append(" caja.estabelecimento, "); sb.append(" caja.terminal "); sb.append("ORDER BY caja.nomePuntoVenta, caja.datavenda "); - + return sb.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java new file mode 100644 index 000000000..c59b0ab9c --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java @@ -0,0 +1,240 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.ResultSet; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.log4j.Logger; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estacion; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasCartoesBean; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +public class RelatorioVendasCartoesAlternativo extends Relatorio { + + private static Logger log = Logger.getLogger(RelatorioVendasCartoesAlternativo.class); + + List list = null; + + public RelatorioVendasCartoesAlternativo(Map parametros, Connection conexao, final Boolean buscarPorDataDaVenda) throws Exception { + super(parametros, conexao); + + this.setCustomDataSource(new DataSource(this) { + + public void initDados() throws Exception { + Connection conexao = this.relatorio.getConexao(); + Map parametros = this.relatorio.getParametros(); + + NamedParameterStatement stmt = null; + ResultSet rset = null; + + String dataInicial = parametros.get("DATA_INICIAL").toString() + " 00:00:00"; + String dataFinal = parametros.get("DATA_FINAL").toString() + " 23:59:59"; + Empresa empresa = (Empresa) parametros.get("EMPRESA"); + PuntoVenta puntoVenta = (PuntoVenta) parametros.get("PUNTOVENTA"); + Usuario usuario = (Usuario) parametros.get("USUARIO"); + Estacion estacao = (Estacion) parametros.get("ESTACION"); + String tipoAgencias = (String) parametros.get("TIPOPUNTOVENTA"); + + String sql = getSql(dataInicial, dataFinal, empresa, puntoVenta, tipoAgencias, usuario, estacao, buscarPorDataDaVenda); + + log.info("query=" + sql); + + try { + stmt = new NamedParameterStatement(conexao, sql); + + if (empresa != null) { + stmt.setInt("empresaId", empresa.getEmpresaId()); + } + if (puntoVenta != null) { + stmt.setInt("puntoventaId", puntoVenta.getPuntoventaId()); + } + if (dataInicial != null) { + stmt.setString("dataInicial", dataInicial); + } + if (dataFinal != null) { + stmt.setString("dataFinal", dataFinal); + } + if (estacao != null) { + stmt.setInt("estacionId", estacao.getEstacionId()); + } + if (usuario != null) { + stmt.setInt("usuarioId", usuario.getUsuarioId()); + } + + rset = stmt.executeQuery(); + + list = new ArrayList(); + BigDecimal valorTotal = BigDecimal.ZERO; + while (rset.next()) { + + RelatorioVendasCartoesBean bean = new RelatorioVendasCartoesBean(); + + bean.setDataVenda(rset.getDate("dataVenda")); + bean.setDataOperacao(rset.getString("dataOperacao") != null ? DateUtil.getDateFromString(rset.getString("dataOperacao"), "ddMMyy") : null); + bean.setDescPagamento(rset.getString("descPagamento") != null ? rset.getString("descPagamento") : null); + bean.setValor(rset.getBigDecimal("valor") != null ? rset.getBigDecimal("valor") : null); + bean.setAutorizacao(rset.getString("autorizacao") != null ? rset.getString("autorizacao") : null); + bean.setQtdParcelas(rset.getInt("qtdParcelas")); + + valorTotal = valorTotal.add(bean.getValor() != null ? bean.getValor() : BigDecimal.ZERO); + bean.setValorTotal(valorTotal); + + list.add(bean); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + if (rset != null && !rset.isClosed()) { + rset.close(); + } + if (stmt != null && !stmt.isClosed()) { + stmt.close(); + } + } + } + }); + + this.setCollectionDataSource(new JRBeanCollectionDataSource(list)); + } + + // private RelatorioVendasCartoesBean calcTotalValor(RelatorioVendasCartoesBean bean) { + // BigDecimal valorTotal = bean.getValorTotal().add(bean.getValorTotal()); + // bean.setValorTotal(valorTotal); + // return bean; + // } + + @Override + protected void processaParametros() throws Exception { + } + + private String getSql(String dataInicial, String dataFinal, Empresa empresa, PuntoVenta puntoVenta, String tipoAgencias, Usuario usuario, Estacion estacion, Boolean buscarPorDataDaVenda) { + + StringBuilder sb = new StringBuilder(); + + sb.append("SELECT caja.descpago as descPagamento,"); + sb.append(" to_char(caja.dataoperacao, 'ddMMyyyy') as dataOperacao,"); + sb.append(" caja.autorizacao as autorizacao,"); + sb.append(" coalesce(caja.qtdparcelas, 1) as qtdParcelas ,"); + sb.append(" trunc(caja.datavenda) as dataVenda, "); + sb.append(" sum(caja.preco) as valor "); + sb.append("FROM"); + sb.append(" (SELECT fp.descpago AS descpago,"); + sb.append(" ct.fecoperacion AS dataoperacao,"); + sb.append(" ct.numautorizacion AS autorizacao,"); + sb.append(" ct.cantparcelas AS qtdparcelas,"); + sb.append(" c.fechorventa AS datavenda,"); + sb.append(" case when c.motivocancelacion_id is null then cfp.importe else cfp.importe * -1 end AS preco"); + sb.append(" FROM caja c"); + sb.append(" INNER JOIN caja_formapago cfp ON c.caja_id=cfp.caja_id AND cfp.activo = 1 "); + sb.append(" INNER JOIN marca ma on ma.marca_id = c.marca_id "); + sb.append(" INNER JOIN forma_pago fp ON cfp.formapago_id=fp.formapago_id"); + sb.append(" LEFT JOIN caja_det_pago cdp ON (c.caja_id = cdp.caja_id and cdp.cajaformapago_id = cfp.cajaformapago_id)"); + sb.append(" LEFT JOIN caja_tarjeta ct ON (ct.cajadetpago_id = cdp.cajadetpago_id)"); + sb.append(" INNER JOIN punto_venta pt ON (pt.puntoventa_id = c.puntoventa_id) "); + sb.append(" WHERE c.indreimpresion = 0 "); + + if (empresa != null) { + sb.append("and ma.empresa_id = :empresaId "); + } + + if (puntoVenta != null) { + sb.append("AND c.puntoventa_id = :puntoventaId "); + } + + if (estacion != null) { + sb.append("AND c.estacion_id = :estacionId "); + } + + if (usuario != null) { + sb.append(" and c.usuario_id = :usuarioId "); + } + + if (dataInicial != null && buscarPorDataDaVenda) { + sb.append("AND c.fechorventa >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') "); + } else if (dataInicial != null && !buscarPorDataDaVenda) { + sb.append("AND c.feccorte >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') "); + } + + if (dataFinal != null && buscarPorDataDaVenda) { + sb.append("AND c.fechorventa <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') "); + } else if (dataInicial != null && !buscarPorDataDaVenda) { + sb.append("AND c.feccorte <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') "); + } + + sb.append(tipoAgencias.equals("-1") || tipoAgencias.equals("TODAS") ? "" : " and pt.tipoptovta_id not in (" + tipoAgencias + ") "); + + sb.append(" AND fp.formapago_id IN(2,3)"); + sb.append(" AND c.activo = 1 "); + + sb.append(" UNION "); + sb.append(" SELECT "); + sb.append(" fp.descpago as descpago, "); + sb.append(" ct.fecoperacion as dataoperacao, "); + sb.append(" ct.numautorizacion as autorizacao, "); + sb.append(" coalesce(ct.cantparcelas, 1) as qtdparcelas, "); + sb.append(" coalesce(c.fechorventa, cd.fechorvta) as datavenda, "); + sb.append(" case when cdp.importe < 0 and fp.formapago_id in (3, 2) then 0 else cdp.importe end as preco "); + sb.append(" FROM caja_diversos cd "); + sb.append(" JOIN caja_diversos_pago cdp on cdp.cajadiversos_id = cd.cajadiversos_id "); + sb.append(" INNER JOIN forma_pago fp on fp.formapago_id = cdp.formapago_id "); + sb.append(" INNER JOIN evento_extra ee on ee.eventoextra_id = cd.eventoextra_id "); + sb.append(" LEFT JOIN boleto c on c.boleto_id = ee.boleto_id "); + sb.append(" LEFT JOIN caja_tarjeta ct on ( cdp.cajatarjeta_id = ct.cajatarjeta_id) "); + sb.append(" WHERE cd.activo = 1 "); + sb.append(" AND (ee.boleto_id is null or ee.boleto_id = c.boleto_id) "); + sb.append(" AND fp.formapago_id in (3, 2) "); + + if (empresa != null) { + sb.append("and ee.empresa_id = :empresaId "); + } + + if (puntoVenta != null) { + sb.append("AND cd.puntoventa_id = :puntoventaId "); + } + + if (estacion != null) { + sb.append("AND cd.estacion_id = :estacionId "); + } + + if (usuario != null) { + sb.append(" AND cd.usuario_id = :usuarioId "); + } + + if (dataInicial != null && buscarPorDataDaVenda) { + sb.append(" AND cd.fechorvta >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') "); + } else if (dataInicial != null && !buscarPorDataDaVenda) { + sb.append(" AND cd.feccorte >= TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI:SS') "); + } + + if (dataFinal != null && buscarPorDataDaVenda) { + sb.append(" AND cd.fechorvta <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') "); + } else if (dataInicial != null && !buscarPorDataDaVenda) { + sb.append(" AND cd.feccorte <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS') "); + } + + sb.append(tipoAgencias.equals("-1") || tipoAgencias.equals("TODAS") ? "" : " and pt.tipoptovta_id not in (" + tipoAgencias + ") "); + sb.append(" ) caja "); + + sb.append("GROUP BY caja.descpago,"); + sb.append(" to_char(caja.dataoperacao, 'ddMMyyyy'),"); + sb.append(" caja.autorizacao,"); + sb.append(" caja.qtdparcelas,"); + sb.append(" trunc(caja.datavenda) "); + sb.append("ORDER BY caja.descpago, trunc(caja.datavenda), caja.autorizacao"); + + return sb.toString(); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoesAlternativo_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoesAlternativo_es.properties new file mode 100644 index 000000000..58a8630a3 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoesAlternativo_es.properties @@ -0,0 +1,35 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. +msg.a=à + +#Labels header +header.titulo.relatorio=Relatório Vendas de Cartões +header.periodo=Per\u00EDodo\: +header.data.hora=Data/Hora\: +header.pagina=P\u00E1gina\: +header.filtro=Filtro\: +header.filtro.servico=Servi\u00E7o\: +header.filtro.empresa=Empresa: +header.filtro.agencia=Agência: +header.filtro.estacao=Estação: +header.filtro.bilheteiro=Bilheteiro: +header.filtro.grupo=Grupo de Linhas\: + +#Labels detail + +detail.dataOperacao=Data Operação +detail.dataVenda=Data Venda +detail.autorizacao=Autorização +detail.qtdParcelas=Quantidade Parcelas +detail.valorTotal=Valor Total +detail.valor=Valor R$ + +#Group + +group.total=Total Geral: +sub.total=Sub Total: +total.debito=Total Débito: +total.credito=Total Crédito: +linhas=Linhas + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoesAlternativo_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoesAlternativo_pt_BR.properties new file mode 100644 index 000000000..58a8630a3 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasCartoesAlternativo_pt_BR.properties @@ -0,0 +1,35 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. +msg.a=à + +#Labels header +header.titulo.relatorio=Relatório Vendas de Cartões +header.periodo=Per\u00EDodo\: +header.data.hora=Data/Hora\: +header.pagina=P\u00E1gina\: +header.filtro=Filtro\: +header.filtro.servico=Servi\u00E7o\: +header.filtro.empresa=Empresa: +header.filtro.agencia=Agência: +header.filtro.estacao=Estação: +header.filtro.bilheteiro=Bilheteiro: +header.filtro.grupo=Grupo de Linhas\: + +#Labels detail + +detail.dataOperacao=Data Operação +detail.dataVenda=Data Venda +detail.autorizacao=Autorização +detail.qtdParcelas=Quantidade Parcelas +detail.valorTotal=Valor Total +detail.valor=Valor R$ + +#Group + +group.total=Total Geral: +sub.total=Sub Total: +total.debito=Total Débito: +total.credito=Total Crédito: +linhas=Linhas + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoesAlternativo.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoesAlternativo.jasper new file mode 100644 index 0000000000000000000000000000000000000000..872ca2d46fedc8e23f6d9ad0ad9b9a702919f837 GIT binary patch literal 38071 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band splitType="Stretch"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasCartoesController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasCartoesController.java index 4df5347d4..0380c26ca 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasCartoesController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasCartoesController.java @@ -28,6 +28,7 @@ import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; import com.rjconsultores.ventaboletos.entidad.Usuario; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasCartoes; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasCartoesAlternativo; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService; import com.rjconsultores.ventaboletos.utilerias.DateUtil; @@ -40,7 +41,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject; import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper; -import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPuntoVentaSimple; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderTipoPuntoVenta; import com.trg.search.Filter; @@ -51,7 +51,7 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; private Datebox dataInicial; - private Datebox dataFinal; + private Datebox dataFinal; private MyComboboxEstandar cmbEmpresa; private MyComboboxPuntoVenta cmbPuntoVenta; private MyComboboxEstacion cmbEstacion; @@ -69,16 +69,16 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer { private static final String TODOS_VALUE = new Integer(-1).toString(); private static final String TODOS = "TODAS"; private Bandbox bbPesquisaPuntoVenta; - + private Radio radioDataVenda; - + @Autowired - private DataSource dataSourceRead; - + private DataSource dataSourceRead; + @Override public void doAfterCompose(Component comp) throws Exception { - super.doAfterCompose(comp); + super.doAfterCompose(comp); lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); lsTipoPuntoVenta = tipoPuntoVentaService.obtenerTodos(); tipoPuntoVentaSelList.setItemRenderer(new RenderTipoPuntoVenta()); @@ -89,18 +89,17 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer { * */ @SuppressWarnings({ "rawtypes", "unchecked" }) - private void executarRelatorio() throws Exception { + private void executarRelatorio(boolean isLayoutAlternatico) throws Exception { Map parametros = new HashMap(); - - if(dataInicial.getValue() == null){ + if (dataInicial.getValue() == null) { return; } - if(dataFinal.getValue() == null){ + if (dataFinal.getValue() == null) { return; } parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioVendasCartoesController.window.title")); - + lsTipoPuntoVenta = new ArrayList(Arrays.asList(tipoPuntoVentaSelList.getData())); if (lsTipoPuntoVenta.size() > 0) { @@ -118,13 +117,13 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer { parametros.put("TIPOPUNTOVENTA_ID", TODOS_VALUE); parametros.put("TIPOPUNTOVENTA", TODOS); } - + StringBuilder filtro = new StringBuilder("Filtros\n"); Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); if (itemEmpresa != null) { Empresa empresa = (Empresa) itemEmpresa.getValue(); - if(empresa.getEmpresaId() > -1) { + if (empresa.getEmpresaId() > -1) { parametros.put("EMPRESA", empresa); parametros.put("NOME_EMPRESA", empresa.getNombempresa()); filtro.append(empresa.getNombempresa()); @@ -134,48 +133,56 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer { } else { filtro.append("Todas"); } + Comboitem itemPuntoVenta = cmbPuntoVenta.getSelectedItem(); if (itemPuntoVenta != null) { PuntoVenta puntoVenta = (PuntoVenta) itemPuntoVenta.getValue(); - if(puntoVenta.getPuntoventaId() > -1) { + if (puntoVenta.getPuntoventaId() > -1) { parametros.put("PUNTOVENTA", puntoVenta); parametros.put("NOME_AGENCIA", puntoVenta.getNombpuntoventa()); } else { parametros.put("NOME_AGENCIA", "Todas"); - } - }else { + } + } else { parametros.put("NOME_AGENCIA", "Todas"); } + Comboitem cbiUsuario = cmbUsuario.getSelectedItem(); if (cbiUsuario != null) { Usuario usuario = (Usuario) cbiUsuario.getValue(); - if(usuario.getUsuarioId() > -1) { + if (usuario.getUsuarioId() > -1) { parametros.put("USUARIO", usuario); parametros.put("NOME_USUARIO", usuario.getNombUsuarioCompleto()); } else { parametros.put("NOME_USUARIO", "Todos"); } - }else { + } else { parametros.put("NOME_USUARIO", "Todos"); } + Comboitem itemEstacion = cmbEstacion.getSelectedItem(); if (itemEstacion != null) { Estacion estacion = (Estacion) itemEstacion.getValue(); - if(estacion.getEstacionId() > -1) { + if (estacion.getEstacionId() > -1) { parametros.put("ESTACION", estacion); parametros.put("ESTACAO", estacion.getDescestacion()); - } - else { + } else { parametros.put("ESTACAO", "Todas"); } - }else { + } else { parametros.put("ESTACAO", "Todas"); } + parametros.put("DATA_INICIAL", DateUtil.getStringDate(dataInicial.getValue(), "dd/MM/yyyy")); parametros.put("DATA_FINAL", DateUtil.getStringDate(dataFinal.getValue(), "dd/MM/yyyy")); - - parametros.put("FILTROS", filtro.toString()); - Relatorio relatorio = new RelatorioVendasCartoes(parametros, dataSourceRead.getConnection(), radioDataVenda.isSelected()); + + parametros.put("FILTROS", filtro.toString()); + Relatorio relatorio = null; + if (isLayoutAlternatico) { + relatorio = new RelatorioVendasCartoesAlternativo(parametros, dataSourceRead.getConnection(), radioDataVenda.isSelected()); + } else { + relatorio = new RelatorioVendasCartoes(parametros, dataSourceRead.getConnection(), radioDataVenda.isSelected()); + } Map args = new HashMap(); args.put("relatorio", relatorio); @@ -183,8 +190,7 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer { openWindow("/component/reportView.zul", Labels.getLabel("relatorioVendasCartoesController.window.title"), args, MODAL); } - - + public void onClick$btnPesquisa(Event ev) { executarPesquisa(); } @@ -193,7 +199,7 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer { HibernateSearchObject tipoPuntoVentaBusqueda = new HibernateSearchObject(TipoPuntoVenta.class, pagingtipoPuntoVenta.getPageSize()); - + tipoPuntoVentaBusqueda.addFilterOr(Filter.like("desctipo", "%" + txtPalavraPesquisa.getText().trim().toUpperCase().concat("%")), Filter.like("desctipo", "%" + txtPalavraPesquisa.getText().trim().toUpperCase().concat("%"))); tipoPuntoVentaBusqueda.addSortAsc("desctipo"); @@ -211,27 +217,26 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer { } } } - public void onClick$btnExecutarRelatorio(Event ev) throws Exception{ - executarRelatorio(); - } - - public void onDoubleClick$tipoPuntoVentaList(Event ev) { + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + executarRelatorio(false); + } + + public void onClick$btnExecutarRelatorioAlternativo(Event ev) throws Exception { + executarRelatorio(true); + } + + public void onDoubleClick$tipoPuntoVentaList(Event ev) { TipoPuntoVenta puntoVentaSel = (TipoPuntoVenta) tipoPuntoVentaList.getSelected(); tipoPuntoVentaSelList.addItemNovo(puntoVentaSel); - } - - public void onDoubleClick$tipoPuntoVentaSelList(Event ev) { + public void onDoubleClick$tipoPuntoVentaSelList(Event ev) { TipoPuntoVenta puntoVentaSel = (TipoPuntoVenta) tipoPuntoVentaSelList.getSelected(); tipoPuntoVentaSelList.removeItem(puntoVentaSel); - } - private void limparPesquisaTipoAgencia() { - tipoPuntoVentaList.clearSelection(); lsTipoPuntoVenta.clear(); this.bbPesquisaPuntoVenta.setValue(""); @@ -240,12 +245,11 @@ public class RelatorioVendasCartoesController extends MyGenericForwardComposer { public Datebox getDatInicial() { return dataInicial; } - + public void onClick$btnLimpar(Event ev) { limparPesquisaTipoAgencia(); } - public void setDatInicial(Datebox datInicial) { this.dataInicial = datInicial; } diff --git a/web/gui/relatorios/filtroRelatorioVendasCartoes.zul b/web/gui/relatorios/filtroRelatorioVendasCartoes.zul index 78fe89098..e180dfa3c 100644 --- a/web/gui/relatorios/filtroRelatorioVendasCartoes.zul +++ b/web/gui/relatorios/filtroRelatorioVendasCartoes.zul @@ -124,6 +124,8 @@