From 39f59d61fb15ae05b39ac19a1df2deb6e6798548 Mon Sep 17 00:00:00 2001 From: "igor.rodrigo" Date: Fri, 23 Oct 2015 20:15:11 +0000 Subject: [PATCH] fixes bug 6770 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49399 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioAidf.java | 71 ++++++ .../RelatorioAidf_es_BR.properties | 21 ++ .../RelatorioAidf_pt_BR.properties | 20 ++ .../relatorios/templates/RelatorioAidf.jasper | Bin 0 -> 30687 bytes .../relatorios/templates/RelatorioAidf.jrxml | 203 ++++++++++++++++++ .../relatorios/RelatorioAidfController.java | 158 ++++++++++++++ .../relatorios/ItemMenuRelatorioAidf.java | 25 +++ web/WEB-INF/i3-label_es_MX.label | 9 +- web/WEB-INF/i3-label_pt_BR.label | 9 +- web/gui/relatorios/filtroRelatorioAidf.zul | 40 ++++ 10 files changed, 554 insertions(+), 2 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidf.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_es_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidf.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidf.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioAidf.java create mode 100644 web/gui/relatorios/filtroRelatorioAidf.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidf.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidf.java new file mode 100644 index 000000000..775197489 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAidf.java @@ -0,0 +1,71 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.util.HashMap; +import java.util.Map; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +public class RelatorioAidf extends Relatorio { + + public RelatorioAidf(Map parametros, Connection conexao) throws Exception + { + super(parametros, conexao); + + this.setCustomDataSource(new ArrayDataSource(this) { + + public void initDados() throws Exception { + Connection conexao = this.relatorio.getConexao(); + Map parametros = this.relatorio.getParametros(); + String sql = getSql(); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + + ResultSet rset = stmt.executeQuery(); + + while (rset.next()) { + Map dataResult = new HashMap(); + dataResult.put("aidf", rset.getString("aidf")); + dataResult.put("empresa", rset.getString("nombempresa")); + dataResult.put("agencia", rset.getString("nombpuntoventa")); + dataResult.put("serie", rset.getString("serie")); + dataResult.put("numeracao", rset.getString("numeracao")); + dataResult.put("folios", rset.getString("folios")); + this.dados.add(dataResult); + } + + this.resultSet = rset; + } + }); + } + + @Override + protected void processaParametros() throws Exception { + } + + private String getSql() { + StringBuilder sql = new StringBuilder(); + sql.append(" select a.aidf_id as aidf, e.nombempresa, p.nombpuntoventa, a.serie, "); + sql.append(" concat(a.forminicial, concat('-',a.formfinal)) as numeracao,"); + sql.append(" concat(dab.numfolioinicial,concat('-',dab.numfoliofinal)) as folios "); + sql.append(" from aidf a "); + sql.append(" inner join empresa e on e.empresa_id = a.empresa_id "); + sql.append(" inner join abasto_boleto ab on a.empresa_id = ab.empresa_id "); + sql.append(" inner join det_abasto_boleto dab on dab.abastoboleto_id = ab.abastoboleto_id "); + sql.append(" inner join punto_venta p on p.puntoventa_id = ab.puntoventa_id "); + if(parametros.get("EMPRESA_ID") != null){ + sql.append(" where a.empresa_id = ").append(parametros.get("EMPRESA_ID")); + } + if(parametros.get("SERIE") != null){ + sql.append(" and a.serie = '").append(parametros.get("SERIE")).append("'"); + } + sql.append(" group by a.aidf_id, e.nombempresa, p.nombpuntoventa, a.serie, concat(a.forminicial, concat('-',a.formfinal)), "); + sql.append(" concat(dab.numfolioinicial,concat('-',dab.numfoliofinal)) "); + sql.append(" order by a.aidf_id"); + return sql.toString(); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_es_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_es_BR.properties new file mode 100644 index 000000000..d76a88fb5 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_es_BR.properties @@ -0,0 +1,21 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: + +#Labels header +label.aidf=AIDF +label.empresa=Empresa +label.agencia=Agência +label.serie=Série +label.bilhete=Bilhetes +label.numeracao=Numeração + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_pt_BR.properties new file mode 100644 index 000000000..2f6485486 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidf_pt_BR.properties @@ -0,0 +1,20 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: + +#Labels header +label.aidf=AIDF +label.empresa=Empresa +label.agencia=Agencia +label.serie=Serie +label.bilhete=Bilhetes +label.numeracao=Numeração diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidf.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAidf.jasper new file mode 100644 index 0000000000000000000000000000000000000000..0672d4fa14725e210f49914642e0409ebff89704 GIT binary patch literal 30687 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfController.java new file mode 100644 index 000000000..e89d38635 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfController.java @@ -0,0 +1,158 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.sql.DataSource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAidf; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +@Controller("relatorioAidfController") +@Scope("prototype") +public class RelatorioAidfController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + + private Datebox datInicial; + private Datebox datFinal; + private MyComboboxEstandar cmbEmpresa; + private List lsEmpresa; + private Textbox txtSerie; + + @Autowired + private EmpresaService empresaService; + @Autowired + private DataSource dataSourceRead; + + @Override + public void doAfterCompose(Component comp) throws Exception { + lsEmpresa = empresaService.obtenerTodos(); + super.doAfterCompose(comp); + } + + /** + * @throws Exception + * + */ + @SuppressWarnings({ "rawtypes", "unchecked" }) + private void executarRelatorio() throws Exception { + Relatorio relatorio; + + Map parametros = new HashMap(); + + StringBuilder filtro = new StringBuilder(); + + parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioAidfController.window.title")); + parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); + parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario()); + + filtro.append("Empresa: "); + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + if (itemEmpresa != null) { + Empresa empresa = (Empresa) itemEmpresa.getValue(); + parametros.put("EMPRESA_ID", empresa.getEmpresaId()); + filtro.append(empresa.getNombempresa() + ";"); + } else { + filtro.append(" Todas;"); + } + + filtro.append("Serie: "); + if(!txtSerie.getValue().equals("")){ + parametros.put("SERIE", txtSerie.getValue()); + filtro.append(txtSerie.getValue() + ";"); + }else{ + filtro.append(" Todas;"); + } + + parametros.put("FILTROS", filtro.toString()); + relatorio = new RelatorioAidf(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioAidfController.window.title"), args, MODAL); + } + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception{ + executarRelatorio(); + } + + private void executarPesquisa() { + + } + + public void onClick$btnPesquisa(Event ev) { + executarPesquisa(); + } + + public void onClick$btnLimpar(Event ev) { + + } + + public void onDoubleClick$puntoVentaSelList(Event ev) { + + } + + public void onDoubleClick$puntoVentaList(Event ev) { + + } + + public Datebox getDatInicial() { + return datInicial; + } + + public void setDatInicial(Datebox datInicial) { + this.datInicial = datInicial; + } + + public Datebox getDatFinal() { + return datFinal; + } + + public void setDatFinal(Datebox datFinal) { + this.datFinal = datFinal; + } + + public List getLsEmpresa() { + return lsEmpresa; + } + + public void setLsEmpresa(List lsEmpresa) { + this.lsEmpresa = lsEmpresa; + } + + public MyComboboxEstandar getCmbEmpresa() { + return cmbEmpresa; + } + + public void setCmbEmpresa(MyComboboxEstandar cmbEmpresa) { + this.cmbEmpresa = cmbEmpresa; + } + + public Textbox getTxtSerie() { + return txtSerie; + } + + public void setTxtSerie(Textbox txtSerie) { + this.txtSerie = txtSerie; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioAidf.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioAidf.java new file mode 100644 index 000000000..09a9edbed --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioAidf.java @@ -0,0 +1,25 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; + +public class ItemMenuRelatorioAidf extends DefaultItemMenuSistema { + + public ItemMenuRelatorioAidf() { + super("indexController.mniRelatorioAIDF.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOAIDF"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioAidf.zul", + Labels.getLabel("relatorioAidfController.window.title"), getArgs(), desktop); + + } +} diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index ae2d13464..22c56eabe 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -248,6 +248,7 @@ indexController.mniRelatorioCorridas.label = Reporte de Corridas indexController.mniRelatorioDemandas.label = Reporte de Demandas indexController.mniRelatorioReceitaServico.label = Relatório de Receita por Serviço indexController.mniRelatorioCancelamentoVendaCartao.label = Relatório Cancelamento de Venda de Cartão +indexController.mniRelatorioAIDF.label = Relatório AIDF indexController.mniPrecoApanhe.label = Preço Apanhe indexController.mniRelatorioVendasPacotesResumido.label = Ventas de Paquetes - Resumido indexController.mniRelatorioVendasPacotesDetalhado.label = Ventas de Paquetes - Detalhado @@ -524,6 +525,13 @@ relatorioCancelamentoVendaCartaoController.btnLimpar.label = Limpar relatorioCancelamentoVendaCartaoController.lbNumero.value = Número Agência relatorioCancelamentoVendaCartaoController.lbBilheteiro.value = Bilheteiro +#Relatorio Aidf +relatorioAidfController.window.title = Relatório Aidf +relatorioAidfController.datainicial.value = Data Inicial +relatorioAidfController.dataFinal.value = Data Final +relatorioAidfController.lbEmpresa.value = Empresa +relatorioAidfController.lbSerie.value = Série + # Pantalla Editar clase editarClaseServicioController.window.title = Clase de servicio editarClaseServicioController.btnApagar.tooltiptext = Eliminar @@ -5870,7 +5878,6 @@ conferenciaController.btnRemoverObservacaoLog.tooltiptext = Remover Observação conferenciaController.btnAdicionarObservacaoLog.tooltiptext = Adicionar Observação conferenciaController.msg.adicionarLogConferencia = Observação adicionada com sucesso conferenciaController.msg.removerLogConferencia = Observação removido com sucesso -conferenciaController.msg.numfoliosistemaNaoInformado = Nº Bilhete não foi informado conferenciaController.lhNumAsiento.value = Asiento conferenciaController.lhNumFolioSistema.value = Folio Sistema conferenciaController.lhNumSeriePreimpresa.value = Série Pré-impressa diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index a3c42ce8f..87d389da2 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -253,6 +253,7 @@ indexController.mniRelatorioCorridas.label = Relatório de Serviços indexController.mniRelatorioDemandas.label = Relatório de Demandas indexController.mniRelatorioReceitaServico.label = Relatório de Receita por Serviço indexController.mniRelatorioCancelamentoVendaCartao.label = Relatório Cancelamento de Venda de Cartão +indexController.mniRelatorioAIDF.label = Relatório AIDF indexController.mniPrecoApanhe.label = Preço Apanhe indexController.mniRelatorioVendasPacotesResumido.label = Vendas de Pacotes - Resumido indexController.mniRelatorioVendasPacotesDetalhado.label = Vendas de Pacotes - Detalhado @@ -560,6 +561,13 @@ relatorioCancelamentoVendaCartaoController.btnLimpar.label = Limpar relatorioCancelamentoVendaCartaoController.lbNumero.value = Número Agência relatorioCancelamentoVendaCartaoController.lbBilheteiro.value = Bilheteiro +#Relatorio Aidf +relatorioAidfController.window.title = Relatório Aidf +relatorioAidfController.datainicial.value = Data Inicial +relatorioAidfController.dataFinal.value = Data Final +relatorioAidfController.lbEmpresa.value = Empresa +relatorioAidfController.lbSerie.value = Série + # Pantalla Editar Classe editarClaseServicioController.window.title = Tipo de Classe editarClaseServicioController.btnApagar.tooltiptext = Eliminar @@ -6012,7 +6020,6 @@ conferenciaController.btnRemoverObservacaoLog.tooltiptext = Remover Observação conferenciaController.btnAdicionarObservacaoLog.tooltiptext = Adicionar Observação conferenciaController.msg.adicionarLogConferencia = Observação adicionada com sucesso conferenciaController.msg.removerLogConferencia = Observação removido com sucesso -conferenciaController.msg.numfoliosistemaNaoInformado = Nº Bilhete não foi informado conferenciaController.lhNumAsiento.value = Asento conferenciaController.lhNumFolioSistema.value = Nº Bilhete conferenciaController.lhNumSeriePreimpresa.value = Série Pré-impressa diff --git a/web/gui/relatorios/filtroRelatorioAidf.zul b/web/gui/relatorios/filtroRelatorioAidf.zul new file mode 100644 index 000000000..7adf136dd --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioAidf.zul @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + +