From 4fce3d7538afb74a5e8fde4ccee58742f86895ea Mon Sep 17 00:00:00 2001 From: leonardo Date: Mon, 23 Jun 2014 13:53:36 +0000 Subject: [PATCH] =?UTF-8?q?Relat=C3=B3rio=20por=20Empresa=20corrida=20(fix?= =?UTF-8?q?ed=20bug=20#5394)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@36186 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioEmpresaCorrida.java | 97 +++++++++ .../RelatorioEmpresaCorrida_pt_BR.properties | 27 +++ .../templates/RelatorioEmpresaCorrida.jasper | Bin 0 -> 32233 bytes .../templates/RelatorioEmpresaCorrida.jrxml | 206 ++++++++++++++++++ .../RelatorioEmpresaCorridaBean.java | 62 ++++++ .../RelatorioEmpresaCorridaController.java | 61 ++++++ .../ItemMenuRelatorioEmpresaCorrida.java | 25 +++ web/WEB-INF/i3-label_es_MX.label | 7 + web/WEB-INF/i3-label_pt_BR.label | 6 + .../filtroRelatorioEmpresaCorrida.zul | 40 ++++ 10 files changed, 531 insertions(+) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaCorridaController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioEmpresaCorrida.java create mode 100644 web/gui/relatorios/filtroRelatorioEmpresaCorrida.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java new file mode 100644 index 000000000..9917c1312 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java @@ -0,0 +1,97 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.util.ArrayList; +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.relatorios.utilitarios.RelatorioEmpresaCorridaBean; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioLinhasHorarioBean; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +public class RelatorioEmpresaCorrida extends Relatorio { + + private List lsDadosRelatorio; + + public RelatorioEmpresaCorrida(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + + this.setCustomDataSource(new DataSource(this) { + @Override + public void initDados() throws Exception { + + Connection conexao = this.relatorio.getConexao(); + + Map parametros = this.relatorio.getParametros(); + + @SuppressWarnings("unchecked") + String fecInicio = parametros.get("fecInicio").toString(); + @SuppressWarnings("unchecked") + String fecFinal = parametros.get("fecFinal").toString(); + + String sql = getSql(fecInicio, fecFinal); + + System.out.println(sql); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + ResultSet rset = null; + + rset = stmt.executeQuery(); + + lsDadosRelatorio = new ArrayList(); + + while (rset.next()) { + RelatorioEmpresaCorridaBean empresaCorridaBean = new RelatorioEmpresaCorridaBean(); + empresaCorridaBean.setCorridaId(rset.getInt("corridaId")); + empresaCorridaBean.setEmpresa(rset.getString("empresa")); + empresaCorridaBean.setCoche(Integer.parseInt(rset.getString("coche"))); + empresaCorridaBean.setDestino(rset.getString("destino")); + empresaCorridaBean.setDia(rset.getDate("dia")); + empresaCorridaBean.setHora(rset.getString("hora")); + empresaCorridaBean.setKmts(rset.getInt("kmts")); + empresaCorridaBean.setOrigem(rset.getString("origem")); + + lsDadosRelatorio.add(empresaCorridaBean); + } + + if (lsDadosRelatorio.size() > 0) { + + setLsDadosRelatorio(lsDadosRelatorio); + } + } + }); + } + + public void setLsDadosRelatorio(List lsDadosRelatorio) { + this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio)); + this.lsDadosRelatorio = lsDadosRelatorio; + } + + @Override + protected void processaParametros() throws Exception { + } + + private String getSql(String fecInicio, String fecFinal) { + StringBuffer sql = new StringBuffer(); + + sql.append(" select c.corrida_Id corridaId, e.nombempresa empresa, c.feccorrida dia, a.numautobus coche, "); + sql.append(" o.cveparada origem, d.cveparada destino, "); + sql.append(" to_char(c.fechorsalida, 'HH24:MI') Hora, t.cantkmreal KMTS "); + sql.append(" from corrida c "); + sql.append(" left join parada o on o.parada_id = c.origen_id "); + sql.append(" left join parada d on d.parada_id = c.destino_id "); + sql.append(" left join tramo t on t.origen_id = c.origen_id and t.destino_id = c.destino_id "); + sql.append(" left join empresa e on e.empresa_id = c.empresacorrida_id "); + sql.append(" inner join autobus a on a.autobus_id = c.autobus_id "); + sql.append(" where extract(month from c.feccorrida) = 6 "); + sql.append(" and c.activo = 1 and c.feccorrida between to_date('" + fecInicio + "', 'DD/MM/YYYY') and to_date('" + fecFinal + "', 'DD/MM/YYYY') "); + sql.append(" order by e.nombempresa, c.feccorrida "); + + return sql.toString(); + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties new file mode 100644 index 000000000..91e11dd4d --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties @@ -0,0 +1,27 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. +msg.a=à + +#Labels header +header.titulo.relatorio=Relatório por Empresa Corrida +header.periodo=Período: +header.data.hora=Data/Hora\: +header.pagina=Página\: +header.filtro=Filtro\: +header.filtro.servico=Serviço\: +header.filtro.linha=Linha\: +header.filtro.grupo=Grupo de Linhas\: + +#Labels detail + +detail.dia=Dia +detail.coche=Carro +detail.origen=PASSAGEIROS +detail.destino=PARÂMETROS OPERACIONAIS +detail.hora=Hora +detail.kmts=Kmts +detail.corridaId=Corrida + +linhas=Linhas + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jasper new file mode 100644 index 0000000000000000000000000000000000000000..6056f324e2f40b3a9467fbf82d7d392cd54fa04a GIT binary patch literal 32233 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
  • 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 Lk9zgtj@17E`XyTc literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml new file mode 100644 index 000000000..b4b5b0f7b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java new file mode 100644 index 000000000..ab8ef112a --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java @@ -0,0 +1,62 @@ +package com.rjconsultores.ventaboletos.relatorios.utilitarios; + +import java.util.Date; + +public class RelatorioEmpresaCorridaBean { + protected Integer corridaId; + protected String empresa; + protected Date dia; + protected Integer coche; + protected String origem; + protected String destino; + protected String hora; + protected Integer kmts; + public Date getDia() { + return dia; + } + public void setDia(Date dia) { + this.dia = dia; + } + public Integer getCoche() { + return coche; + } + public void setCoche(Integer coche) { + this.coche = coche; + } + public String getOrigem() { + return origem; + } + public void setOrigem(String origem) { + this.origem = origem; + } + public String getDestino() { + return destino; + } + public void setDestino(String destino) { + this.destino = destino; + } + public String getHora() { + return hora; + } + public void setHora(String hora) { + this.hora = hora; + } + public Integer getKmts() { + return kmts; + } + public void setKmts(Integer kmts) { + this.kmts = kmts; + } + public String getEmpresa() { + return empresa; + } + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + public Integer getCorridaId() { + return corridaId; + } + public void setCorridaId(Integer corridaId) { + this.corridaId = corridaId; + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaCorridaController.java new file mode 100644 index 000000000..4aecd750a --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaCorridaController.java @@ -0,0 +1,61 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +import javax.sql.DataSource; + +import org.apache.log4j.Logger; +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.Datebox; + +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioEmpresaCorrida; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +@Controller("relatorioEmpresaCorridaController") +@Scope("prototype") +public class RelatorioEmpresaCorridaController extends MyGenericForwardComposer { + private static final long serialVersionUID = 1L; + private static Logger log = Logger.getLogger(RelatorioEmpresaCorridaController.class); + + @Autowired + private DataSource dataSource; + + private Datebox datInicial; + private Datebox datFinal; + + private void executarRelatorio() throws Exception { + + Map parametros = new HashMap(); + + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + parametros.put("fecInicio", sdf.format(this.datInicial.getValue())); + parametros.put("fecFinal", sdf.format(this.datFinal.getValue())); + + Relatorio relatorio = new RelatorioEmpresaCorrida(parametros, dataSource.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioEmpresaCorridaController.window.title"), args, MODAL); + + } + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + executarRelatorio(); + } + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioEmpresaCorrida.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioEmpresaCorrida.java new file mode 100644 index 000000000..4c4d25c30 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioEmpresaCorrida.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 ItemMenuRelatorioEmpresaCorrida extends DefaultItemMenuSistema { + + public ItemMenuRelatorioEmpresaCorrida() { + super("indexController.mniRelatorioEmpresaCorrida.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOEMPRESACORRIDA"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioEmpresaCorrida.zul", + Labels.getLabel("relatorioEmpresaCorridaController.window.title"), null, desktop); + } + +} diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 34c2cdf0f..1371f196b 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -223,6 +223,7 @@ indexController.mniRelatorioAcompanhamentoEquivalentes.label = Reporte acompaña indexController.mniRelatorioLinhasHorario.label = Reporte de rutas por horário indexController.mniRelatorioTaxasLinha.label = Reporte de tasas por linea indexController.mniRelatorioSisdap.label=SISDAP +indexController.mniRelatorioEmpresaCorrida.label = Reporte de la Empresa Corrida #PARTE REALIZADA POR MANUEL indexController.mnCortesias.label = Cortesias para empleados @@ -292,6 +293,11 @@ relatorioAproveitamentoController.HoraServico.label = Hora servicio relatorioAproveitamentoController.Classe.label = Clase relatorioAproveitamentoController.btnBuscarServico.label = Buscar servicio +# Relatorio Empresa Corrida +relatorioEmpresaCorridaController.window.title=Reporte Empresa Corrida +relatorioEmpresaCorridaController.lbDataIni.value=Fecha Inicio +relatorioEmpresaCorridaController.lbDataFin.value=Fecha Final + #Relatorio rutas Horario relatorioLinhasHorarioController.window.title = Reporte de rutas por horário relatorioLinhasHorarioController.lbDataIni.value = Fecha inicial @@ -302,6 +308,7 @@ relatorioLinhasHorarioController.lbLote.label = Lote relatorioLinhasHorarioController.lbLinha.label = Linea relatorioLinhasHorarioController.lbServico.label = Clase + relatorioLinhasHorarioController.lbNumRuta.label = Num. linea relatorioLinhasHorarioController.lbPrefixo.label = Prefijo diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 9543999b8..e58c854b4 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -227,6 +227,7 @@ indexController.mniRelatorioLinhasHorario.label = Relatório de Linhas por Horá indexController.mniRelatorioTaxasLinha.label = Relatório de Taxas por Linha indexController.mniRelatorioDevolucaoBilhetes.label = Relatório de Devolução de Bilhetes indexController.mniRelatorioSisdap.label=SISDAP +indexController.mniRelatorioEmpresaCorrida.label = Relatório por Empresa Corrida #PARTE REALIZADA POR MANUEL indexController.mnCortesias.label = Cortesias Para Funcionários @@ -298,6 +299,11 @@ relatorioAproveitamentoController.HoraServico.label = Hora Serviço relatorioAproveitamentoController.Classe.label = Classe relatorioAproveitamentoController.btnBuscarServico.label = Buscar Serviço +# Relatorio Empresa Corrida +relatorioEmpresaCorridaController.window.title=Relatório Empresa Corrida +relatorioEmpresaCorridaController.lbDataIni.value=Data Inicial +relatorioEmpresaCorridaController.lbDataFin.value=Data Final + #Relatorio Linhas Horario relatorioLinhasHorarioController.window.title = Relatório de Linhas por Horário relatorioLinhasHorarioController.lbDataIni.value = Data Inicial diff --git a/web/gui/relatorios/filtroRelatorioEmpresaCorrida.zul b/web/gui/relatorios/filtroRelatorioEmpresaCorrida.zul new file mode 100644 index 000000000..7997586da --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioEmpresaCorrida.zul @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + +