From da94f4a0e771f349b0bf1f26dbf1cc3f3a3be37e Mon Sep 17 00:00:00 2001 From: "thiago.penido" Date: Wed, 16 Sep 2015 13:03:39 +0000 Subject: [PATCH] bug 6615 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@47920 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDescontos.java | 120 +++++ .../RelatorioDescontos_es.properties | 22 + .../RelatorioDescontos_pt_BR.properties | 22 + .../templates/RelatorioDescontos.jasper | Bin 0 -> 48392 bytes .../templates/RelatorioDescontos.jrxml | 494 ++++++++++++++++++ .../RelatorioDescontosController.java | 110 ++++ .../ItemMenuRelatorioDescontos.java | 24 + web/WEB-INF/i3-label_es_MX.label | 10 + web/WEB-INF/i3-label_pt_BR.label | 11 +- .../relatorios/filtroRelatorioDescontos.zul | 38 ++ 10 files changed, 850 insertions(+), 1 deletion(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontos_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontos_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDescontosController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioDescontos.java create mode 100644 web/gui/relatorios/filtroRelatorioDescontos.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java new file mode 100644 index 000000000..4390082f6 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java @@ -0,0 +1,120 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.Date; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +public class RelatorioDescontos extends Relatorio { + + List> dadosRelatorio = new ArrayList>(); + + public RelatorioDescontos(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + + setCustomDataSource(new DataSource(this){ + @Override + public void initDados() throws Exception { + Connection coneConnection = relatorio.getConexao(); + Map parametros = relatorio.getParametros(); + + Integer idPuntoVenta = (Integer) parametros.get("idPuntoVenta"); + Date fecVentaInicial = new Date(((java.util.Date) parametros.get("fecVentaInicial")).getTime()); + Date fecVentaFinal = new Date(((java.util.Date) parametros.get("fecVentaFinal")).getTime()); + String codconvenio = (String) parametros.get("codconvenio"); + + String query = getQuery(idPuntoVenta, codconvenio); + System.out.println(query); + + NamedParameterStatement statement = new NamedParameterStatement(coneConnection, query); + statement.setDate("fecVentaInicial", fecVentaInicial); + statement.setDate("fecVentaFinal", fecVentaFinal); + if(idPuntoVenta != null) { + statement.setInt("idPuntoVenta", idPuntoVenta); + } + if(codconvenio != null && !codconvenio.isEmpty()) { + statement.setString("codconvenio", codconvenio); + } + + ResultSet resultSet = statement.executeQuery(); + + preencherDadosRelatorio(resultSet); + } + + + }); + } + + private void preencherDadosRelatorio(ResultSet resultSet) throws SQLException { + while (resultSet.next()) { + HashMap singleData = new HashMap(); + singleData.put("codConvenio", resultSet.getString("codConvenio")); + singleData.put("nomeAgencia", resultSet.getString("nomeAgencia")); + singleData.put("dataEmissao", resultSet.getDate("dataEmissao")); + singleData.put("dataViagem", resultSet.getDate("dataViagem")); + singleData.put("codServico", resultSet.getString("codServico")); + singleData.put("codOrigem", resultSet.getString("codOrigem")); + singleData.put("codDestino", resultSet.getString("codDestino")); + singleData.put("tarifaComDesconto", resultSet.getDouble("tarifaComDesconto")); + singleData.put("tut", resultSet.getDouble("tut")); + singleData.put("pedagio", resultSet.getDouble("pedagio")); + dadosRelatorio.add(singleData); + } + + if(!dadosRelatorio.isEmpty()) { + setCollectionDataSource(new JRBeanCollectionDataSource(dadosRelatorio)); + } + } + + private String getQuery(Integer idPuntoVenta, String codconvenio) { + + String query = " SELECT " + + + " CONV.CVECONVENIO AS codConvenio, " + + " PUNT_V.NOMBPUNTOVENTA AS nomeAgencia, " + + " BOL.FECHORVENTA AS dataEmissao, " + + " BOL.FECHORVIAJE AS dataViagem, " + + " BOL.CORRIDA_ID AS codServico, " + + " ORIG.CVEPARADA AS codOrigem, " + + " DEST.CVEPARADA AS codDestino, " + + " BOL.PRECIOPAGADO AS tarifaComDesconto, " + + " BOL.IMPORTETAXAEMBARQUE AS tut, " + + " BOL.IMPORTEPEDAGIO AS pedagio " + + + " FROM BOLETO BOL " + + " JOIN CONVENIO_DET CONV_D ON CONV_D.CONVENIODET_ID = BOL.CONVENIODET_ID " + + " JOIN CONVENIO CONV ON CONV.CONVENIO_ID = CONV_D.CONVENIO_ID " + + " JOIN PUNTO_VENTA PUNT_V ON PUNT_V.PUNTOVENTA_ID = BOL.PUNTOVENTA_ID " + + " JOIN PARADA ORIG ON ORIG.PARADA_ID = BOL.ORIGEN_ID " + + " JOIN PARADA DEST ON DEST.PARADA_ID = BOL.DESTINO_ID " + + + " WHERE " + + " BOL.INDSTATUSOPERACION = 'F' " + + " AND BOL.ACTIVO = 1 " + + " AND BOL.FECHORVENTA BETWEEN :fecVentaInicial AND :fecVentaFinal "; + + if(idPuntoVenta != null) { + query += " AND (BOL.PUNTOVENTA_ID = :idPuntoVenta) "; + } + if (codconvenio != null && !codconvenio.isEmpty()) { + query += " AND (CONV.CVECONVENIO = :codconvenio)"; + } + + query += " ORDER BY CONV.CVECONVENIO "; + + return query; + } + + @Override + protected void processaParametros() throws Exception {} +} \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontos_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontos_es.properties new file mode 100644 index 000000000..3622b3b8b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontos_es.properties @@ -0,0 +1,22 @@ +label.codConvenio = Código do Convênio: +label.fecVentaInicial = Data da Venda Inicial: +label.fecVentaFinal = Data da Venda Final: +label.puntoVenta = Agência: +cabecalho.dataHora = Data/Hora: +cabecalho.impressorPor = Impresso por: +cabecalho.pagina = Página +cabecalho.de = de +label.codigo = Código: +label.nomeAgencia = Agc. Emissora +label.dataEmissao = Data Emissão +label.dataViagem = Data Viagem +label.codServico = Serviço +label.codOrigem = Origem +label.codDestino = Destino +label.tarifaComDesconto = Tarifa c/ des +label.tut = TUT +label.pedagio = Pedágio +label.totalPorConvenio = Total deste Convênio +label.totalGeral = Total Geral +label.total = Total +msg.noData = Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontos_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontos_pt_BR.properties new file mode 100644 index 000000000..3622b3b8b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontos_pt_BR.properties @@ -0,0 +1,22 @@ +label.codConvenio = Código do Convênio: +label.fecVentaInicial = Data da Venda Inicial: +label.fecVentaFinal = Data da Venda Final: +label.puntoVenta = Agência: +cabecalho.dataHora = Data/Hora: +cabecalho.impressorPor = Impresso por: +cabecalho.pagina = Página +cabecalho.de = de +label.codigo = Código: +label.nomeAgencia = Agc. Emissora +label.dataEmissao = Data Emissão +label.dataViagem = Data Viagem +label.codServico = Serviço +label.codOrigem = Origem +label.codDestino = Destino +label.tarifaComDesconto = Tarifa c/ des +label.tut = TUT +label.pedagio = Pedágio +label.totalPorConvenio = Total deste Convênio +label.totalGeral = Total Geral +label.total = Total +msg.noData = Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDescontos.jasper new file mode 100644 index 0000000000000000000000000000000000000000..e63707927705089026a725b02b1c765fba0294c2 GIT binary patch literal 48392 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 K8g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band splitType="Stretch"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDescontosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDescontosController.java new file mode 100644 index 000000000..84df10d81 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDescontosController.java @@ -0,0 +1,110 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.util.HashMap; +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.zhtml.Messagebox; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioDescontos; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +@Controller("relatorioDescontosController") +@Scope("prototype") +public class RelatorioDescontosController extends MyGenericForwardComposer { + private static final long serialVersionUID = 1L; + + @Autowired + private DataSource dataSourceRead; + + private MyComboboxPuntoVenta cmbAgencia; + private Datebox fecVentaInicial; + private Datebox fecVentaFinal; + private Textbox txtCodConvenio; + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + validarAntesImpressao(); + } + + private void validarAntesImpressao() throws Exception { + + if(fecVentaInicial.getValue() == null) { + Messagebox.show( + Labels.getLabel("relatorioDescontosController.info.fecVentaInicial"), + Labels.getLabel("relatorioDescontosController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + return; + } + + if(fecVentaFinal.getValue() == null) { + Messagebox.show( + Labels.getLabel("relatorioDescontosController.info.fecVentaFinal"), + Labels.getLabel("relatorioDescontosController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + return; + } + + executarRelatorio(); + } + + private void executarRelatorio() throws Exception { + Map parametros = new HashMap(); + parametros.put("fecVentaInicial", fecVentaInicial.getValue()); + parametros.put("fecVentaFinal", fecVentaFinal.getValue()); + parametros.put("codconvenio", txtCodConvenio.getValue()); + parametros.put("usuario", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString() + " - " + UsuarioLogado.getUsuarioLogado().getNombusuario()); + parametros.put("nomeRelatorio", Labels.getLabel("relatorioDescontosController.window.title")); + + if (cmbAgencia.getSelectedIndex() != -1) { + + PuntoVenta puntoVenta = (PuntoVenta) cmbAgencia.getSelectedItem().getValue(); + parametros.put("idPuntoVenta", puntoVenta.getPuntoventaId()); + parametros.put("puntoVenta", puntoVenta.getPuntoventaId() + " - " + puntoVenta.getNombpuntoventa()); + } + + Relatorio relatorio = new RelatorioDescontos(parametros, dataSourceRead.getConnection()); + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", Labels.getLabel("relatorioDescontosController.window.title"), args, MODAL); + + } + + public MyComboboxPuntoVenta getCmbAgencia() { + return cmbAgencia; + } + + public void setCmbAgencia(MyComboboxPuntoVenta cmbAgencia) { + this.cmbAgencia = cmbAgencia; + } + public Datebox getFecVentaInicial() { + return fecVentaInicial; + } + public void setFecVentaInicial(Datebox fecVentaInicial) { + this.fecVentaInicial = fecVentaInicial; + } + public Datebox getFecVentaFinal() { + return fecVentaFinal; + } + public void setFecVentaFinal(Datebox fecVentaFinal) { + this.fecVentaFinal = fecVentaFinal; + } + public Textbox getTxtCodConvenio() { + return txtCodConvenio; + } + public void setTxtCodConvenio(Textbox txtCodConvenio) { + this.txtCodConvenio = txtCodConvenio; + } +} \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioDescontos.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioDescontos.java new file mode 100644 index 000000000..321917b74 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioDescontos.java @@ -0,0 +1,24 @@ +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 ItemMenuRelatorioDescontos extends DefaultItemMenuSistema { + + public ItemMenuRelatorioDescontos() { + super("indexController.mniRelatorioDescontos.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIODESCONTOS"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioDescontos.zul", + Labels.getLabel("relatorioDescontosController.window.title"), getArgs() ,desktop); + } +} \ No newline at end of file diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index cf6d4d828..c91cca56d 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -261,6 +261,7 @@ indexController.mniManutencaoPacote.label=Manutenção Pacote indexController.mniEscola.label = Escuela indexController.mniCurso.label = Curso indexController.mniPracaPedagio.label = Praça Pedágio +indexController.mniRelatorioDescontos.label = Relatório Descontos #PARTE REALIZADA POR MANUEL indexController.mnCortesias.label = Cortesias para empleados @@ -5416,6 +5417,15 @@ relatorioGratuidadeController.lbLinhas.value = Ruta relatorioGratuidadeController.lbDataIni.value = Fecha Inicio relatorioGratuidadeController.lbDataFin.value = Fecha Final +# Relatório de Descontos +relatorioDescontosController.window.title = Relatório de Descontos +relatorioDescontosController.lbAgencia.value = Agência +relatorioDescontosController.lbCodConvenio.value = Código Convênio +relatorioDescontosController.lbPeriodoVendaInicial.value = Data Venda Inicial +relatorioDescontosController.lbPeriodoVendaFinal.value = Data Venda Final +relatorioDescontosController.info.fecVentaInicial = Informe a Data Venda Inicial +relatorioDescontosController.info.fecVentaFinal = Informe a Data Venda Final + # Filtro Relatorio de Agências Não Importadas filtroRelatorioAgenciasNaoImportadas.lbDataIni.value = Fecha Inicio filtroRelatorioAgenciasNaoImportadas.lbDataFin.value = Fecha Final diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index dd65d0f51..f2a027eba 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -266,13 +266,13 @@ indexController.mniTotnaofiscalEmpresa.label=Totalizadoes Não-fiscais indexController.mniFormapagoEmpresa.label=Formas de Pagamento indexController.mniRelgerencialEmpresa.label=Relatorio Gerencial indexController.mniImportacionFiscal.label=Importação Fiscal - indexController.mniSubMenuClientePacote.label=Pacote indexController.mniManutencaoPacote.label=Manutenção Pacote indexController.mniEscola.label = Escola indexController.mniCurso.label = Curso indexController.mniPracaPedagio.label = Praça Pedágio +indexController.mniRelatorioDescontos.label = Relatório Descontos #PARTE REALIZADA POR MANUEL indexController.mnCortesias.label = Cortesias Para Funcionários @@ -5495,6 +5495,15 @@ relatorioGratuidadeController.lbLinhas.value = Linha relatorioGratuidadeController.lbDataIni.value = Data Inicio relatorioGratuidadeController.lbDataFin.value = Data Final +# Relatório de Descontos +relatorioDescontosController.window.title = Relatório de Descontos +relatorioDescontosController.lbAgencia.value = Agência +relatorioDescontosController.lbCodConvenio.value = Código Convênio +relatorioDescontosController.lbPeriodoVendaInicial.value = Data Venda Inicial +relatorioDescontosController.lbPeriodoVendaFinal.value = Data Venda Final +relatorioDescontosController.info.fecVentaInicial = Informe a Data Venda Inicial +relatorioDescontosController.info.fecVentaFinal = Informe a Data Venda Final + indexController.mniRelatorioAgenciaFechamento.label= Relatorio Agências Fechamento integracion.totvs=ERRO ao fazer integração com a TOTVS diff --git a/web/gui/relatorios/filtroRelatorioDescontos.zul b/web/gui/relatorios/filtroRelatorioDescontos.zul new file mode 100644 index 000000000..19a69083c --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioDescontos.zul @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +