From 0e1702e876bd876725d01229524b00498b892633 Mon Sep 17 00:00:00 2001 From: leonardo Date: Mon, 30 Jun 2014 15:02:06 +0000 Subject: [PATCH] =?UTF-8?q?OCD=20-=20Relat=C3=B3rio=20de=20perfil=20restri?= =?UTF-8?q?to=20com=20as=20OCD's=20n=C3=A3o=20resgatadas=20(por=20empresa)?= =?UTF-8?q?=20(fixed=20bug=20#5432)?= 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@36280 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioOCDNaoResgatadaEmpresa.java | 110 ++++++++ ...rioOCDNaoResgatadaEmpresa_pt_BR.properties | 32 +++ .../RelatorioOCDNaoResgatadaEmpresa.jasper | Bin 0 -> 36401 bytes .../RelatorioOCDNaoResgatadaEmpresa.jrxml | 266 ++++++++++++++++++ .../utilitarios/RelatorioOCDBean.java | 120 ++++++++ .../relatorios/RelatorioOCDController.java | 93 ++++++ .../item/relatorios/ItemMenuRelatorioOCD.java | 25 ++ web/WEB-INF/i3-label_es_MX.label | 7 + web/WEB-INF/i3-label_pt_BR.label | 7 + web/gui/relatorios/filtroRelatorioOCD.zul | 48 ++++ 10 files changed, 708 insertions(+) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioOCDBean.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOCDController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioOCD.java create mode 100644 web/gui/relatorios/filtroRelatorioOCD.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java new file mode 100644 index 000000000..5a45fbd66 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java @@ -0,0 +1,110 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.text.SimpleDateFormat; +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.RelatorioOCDBean; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { + + private List lsDadosRelatorio; + + public RelatorioOCDNaoResgatadaEmpresa(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(); + + String fecInicio = parametros.get("fecInicio").toString() + " 00:00:00"; + String fecFinal = parametros.get("fecFinal").toString() + " 23:59:59"; + Integer empresaId = parametros.get("empresa") != null ? Integer.parseInt(parametros.get("empresa").toString()) : null; + + String sql = getSql(fecInicio, fecFinal, empresaId); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + ResultSet rset = null; + + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); + stmt.setDate("fecInicio", new java.sql.Date(sdf.parse(fecInicio).getTime())); + stmt.setDate("fecFinal", new java.sql.Date(sdf.parse(fecFinal).getTime())); + if (empresaId != null){ + stmt.setInt("empresaId", empresaId); + } + + rset = stmt.executeQuery(); + + lsDadosRelatorio = new ArrayList(); + + while (rset.next()) { + RelatorioOCDBean ocdBean = new RelatorioOCDBean(); + ocdBean.setBoletoId(rset.getLong("boleto_Id")); + ocdBean.setFecinc(rset.getDate("fecinc")); + ocdBean.setFecpagar(rset.getDate("fecpagar")); + ocdBean.setFecpago(rset.getDate("fecpago")); + ocdBean.setIndpago(rset.getBoolean("indpago")); + ocdBean.setEmpresa(rset.getString("nombempresa")); + ocdBean.setNombpuntoventa(rset.getString("nombpuntoventa") != null ? rset.getString("nombpuntoventa") : ""); + ocdBean.setNombpuntoventapago(rset.getString("nombpuntoventapago") != null ? rset.getString("nombpuntoventapago") : ""); + ocdBean.setNombusuario(rset.getString("nombusuario") != null ? rset.getString("nombusuario") : ""); + ocdBean.setNombusuarioinc(rset.getString("nombusuarioinc") != null ? rset.getString("nombusuarioinc") : ""); + ocdBean.setNombusuariopago(rset.getString("nombusuariopago") != null ? rset.getString("nombusuariopago") : ""); + ocdBean.setNumoperacion(rset.getString("numoperacion")); + ocdBean.setPenalizacion(rset.getBigDecimal("penalizacion")); + ocdBean.setValorPagar(rset.getBigDecimal("valor_Pagar")); + + lsDadosRelatorio.add(ocdBean); + } + + 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, Integer empresaId) { + StringBuffer sql = new StringBuffer(); + + sql.append("select nombempresa, o.*, ui.nombusuario nombusuarioinc, "); + sql.append("up.nombusuario nombusuariopago, u.nombusuario nombusuario, "); + sql.append("p.nombpuntoventa nombpuntoventa, pp.nombpuntoventa nombpuntoventapago "); + sql.append("from ocd o "); + sql.append("join boleto b on b.boleto_id = o.boleto_id "); + sql.append("join empresa e on b.empresacorrida_id = e.empresa_id "); + sql.append("join usuario u on u.usuario_id = o.usuario_id "); + sql.append("join usuario ui on ui.usuario_id = o.usuarioinc_id "); + sql.append("left join usuario up on up.usuario_id = o.usuariopago_id "); + sql.append("join punto_venta p on p.puntoventa_id = o.puntoventa_id "); + sql.append("left join punto_venta pp on pp.puntoventa_id = o.puntoventapago_id "); + sql.append("where o.fecpago is null and o.fecpagar between :fecInicio and :fecFinal "); + if (empresaId != null){ + sql.append("and e.empresa_id = :empresaId "); + } + + return sql.toString(); + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties new file mode 100644 index 000000000..3b2bef5bf --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties @@ -0,0 +1,32 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. +msg.a=à + +#Labels header +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.boletoId=Boleto +detail.nombpuntoventa=Ponto de Venda +detail.numoperacion=Num. Operação +detail.fecpagar=Data Pag. +detail.valorPagar=Vr. Pagar +detail.penalizacion=Penalização +detail.nombusuarioinc=Usuário Inc. + +detail.fecinc=Data Inc. +detail.nombempresa=Empresa +detail.nombusuario=Usuário +detail.nombusuariopago=Usuário Pag. +detail.nombpuntoventapago=Ponto Venda Pag. + +linhas=Linhas + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jasper new file mode 100644 index 0000000000000000000000000000000000000000..8f2ea2bda71f20589c11bc66ddfb8e5fa2527767 GIT binary patch literal 36401 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%0AKb_3 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioOCDBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioOCDBean.java new file mode 100644 index 000000000..80bc8e841 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioOCDBean.java @@ -0,0 +1,120 @@ +package com.rjconsultores.ventaboletos.relatorios.utilitarios; + +import java.math.BigDecimal; +import java.util.Date; + +public class RelatorioOCDBean { + + private Long ocdId; + + private Long boletoId; + + private String numoperacion; + + private Date fecpagar; + private BigDecimal valorPagar; + private BigDecimal penalizacion; + + private Date fecinc; + + private Boolean indpago; + private Date fecpago; + + private String empresa; + private String nombusuario; + private String nombusuarioinc; + private String nombusuariopago; + private String nombpuntoventa; + private String nombpuntoventapago; + + public Long getOcdId() { + return ocdId; + } + public void setOcdId(Long ocdId) { + this.ocdId = ocdId; + } + public Long getBoletoId() { + return boletoId; + } + public void setBoletoId(Long boletoId) { + this.boletoId = boletoId; + } + public String getNumoperacion() { + return numoperacion; + } + public void setNumoperacion(String numoperacion) { + this.numoperacion = numoperacion; + } + public Date getFecpagar() { + return fecpagar; + } + public void setFecpagar(Date fecpagar) { + this.fecpagar = fecpagar; + } + public BigDecimal getValorPagar() { + return valorPagar; + } + public void setValorPagar(BigDecimal valorPagar) { + this.valorPagar = valorPagar; + } + public BigDecimal getPenalizacion() { + return penalizacion; + } + public void setPenalizacion(BigDecimal penalizacion) { + this.penalizacion = penalizacion; + } + public Date getFecinc() { + return fecinc; + } + public void setFecinc(Date fecinc) { + this.fecinc = fecinc; + } + public Boolean getIndpago() { + return indpago; + } + public void setIndpago(Boolean indpago) { + this.indpago = indpago; + } + public Date getFecpago() { + return fecpago; + } + public void setFecpago(Date fecpago) { + this.fecpago = fecpago; + } + public String getEmpresa() { + return empresa; + } + public void setEmpresa(String empresa) { + this.empresa = empresa; + } + public String getNombusuario() { + return nombusuario; + } + public void setNombusuario(String nombusuario) { + this.nombusuario = nombusuario; + } + public String getNombusuarioinc() { + return nombusuarioinc; + } + public void setNombusuarioinc(String nombusuarioinc) { + this.nombusuarioinc = nombusuarioinc; + } + public String getNombusuariopago() { + return nombusuariopago; + } + public void setNombusuariopago(String nombusuariopago) { + this.nombusuariopago = nombusuariopago; + } + public String getNombpuntoventa() { + return nombpuntoventa; + } + public void setNombpuntoventa(String nombpuntoventa) { + this.nombpuntoventa = nombpuntoventa; + } + public String getNombpuntoventapago() { + return nombpuntoventapago; + } + public void setNombpuntoventapago(String nombpuntoventapago) { + this.nombpuntoventapago = nombpuntoventapago; + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOCDController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOCDController.java new file mode 100644 index 000000000..3a9552ad1 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOCDController.java @@ -0,0 +1,93 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.List; +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.Combobox; +import org.zkoss.zul.Datebox; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioOCDNaoResgatadaEmpresa; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +@Controller("relatorioOCDController") +@Scope("prototype") +public class RelatorioOCDController extends MyGenericForwardComposer { + private static final long serialVersionUID = 1L; + private static Logger log = Logger.getLogger(RelatorioOCDController.class); + + @Autowired + private DataSource dataSource; + + @Autowired + private EmpresaService empresaService; + + private Datebox datInicial; + private Datebox datFinal; + private Combobox cmbEmpresa; + + private List lsEmpresas; + + 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())); + if (cmbEmpresa.getSelectedIndex() != -1){ + parametros.put("empresa", ((Empresa)cmbEmpresa.getSelectedItem().getValue()).getEmpresaId()); + } + parametros.put("TITULO", Labels.getLabel("relatorioOCDController.window.title")); + + Relatorio relatorio = new RelatorioOCDNaoResgatadaEmpresa(parametros, dataSource.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioOCDController.window.title"), args, MODAL); + + } + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + executarRelatorio(); + } + + @Override + public void doAfterCompose(Component comp) throws Exception { + lsEmpresas = empresaService.obtenerTodos(); + + super.doAfterCompose(comp); + } + + public Combobox getCmbEmpresa() { + return cmbEmpresa; + } + + public void setCmbEmpresa(Combobox cmbEmpresa) { + this.cmbEmpresa = cmbEmpresa; + } + + public List getLsEmpresas() { + return lsEmpresas; + } + + public void setLsEmpresas(List lsEmpresas) { + this.lsEmpresas = lsEmpresas; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioOCD.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioOCD.java new file mode 100644 index 000000000..808044544 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioOCD.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 ItemMenuRelatorioOCD extends DefaultItemMenuSistema { + + public ItemMenuRelatorioOCD() { + super("indexController.mniRelatorioOCD.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOOCDNAORESGATADAS"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioOCD.zul", + Labels.getLabel("relatorioOCDController.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 eabc5e23d..d9ee0a551 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -225,6 +225,7 @@ indexController.mniRelatorioTaxasLinha.label = Reporte de tasas por linea indexController.mniRelatorioSisdap.label=SISDAP indexController.mniRelatorioEmpresaCorrida.label = Reporte de la Empresa Corrida indexController.mniRelatorioEmpresaOnibus.label = Reporte de la Empresa Onibus +indexController.mniRelatorioOCD.label = Reporte OCD por la Empresa #PARTE REALIZADA POR MANUEL indexController.mnCortesias.label = Cortesias para empleados @@ -304,6 +305,12 @@ relatorioEmpresaOnibusController.window.title=Reporte Empresa Onibus relatorioEmpresaOnibusController.lbDataIni.value=Fecha Inicio relatorioEmpresaOnibusController.lbDataFin.value=Fecha Final +# Relatorio OCD Empresa +relatorioOCDController.window.title=Reporte OCD por la Empresa +relatorioOCDController.lbEmpresa.value=Empresa +relatorioOCDController.lbDataIni.value=Fecha Inicio +relatorioOCDController.lbDataFin.value=Fecha Final + #Relatorio rutas Horario relatorioLinhasHorarioController.window.title = Reporte de rutas por horário relatorioLinhasHorarioController.lbDataIni.value = Fecha inicial diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index a6b7562e5..ae5f77d43 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -229,6 +229,7 @@ indexController.mniRelatorioDevolucaoBilhetes.label = Relatório de Devolução indexController.mniRelatorioSisdap.label=SISDAP indexController.mniRelatorioEmpresaCorrida.label = Relatório por Empresa Corrida indexController.mniRelatorioEmpresaOnibus.label = Relatório por Empresa Ônibus +indexController.mniRelatorioOCD.label = Relatório OCD por Empresa #PARTE REALIZADA POR MANUEL indexController.mnCortesias.label = Cortesias Para Funcionários @@ -310,6 +311,12 @@ relatorioEmpresaOnibusController.window.title=Relatório Empresa Ônibus relatorioEmpresaOnibusController.lbDataIni.value=Data Inicial relatorioEmpresaOnibusController.lbDataFin.value=Data Final +# Relatorio OCD Empresa +relatorioOCDController.window.title=Relatório OCD por Empresa +relatorioOCDController.lbEmpresa.value=Empresa +relatorioOCDController.lbDataIni.value=Data Inicial +relatorioOCDController.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/filtroRelatorioOCD.zul b/web/gui/relatorios/filtroRelatorioOCD.zul new file mode 100644 index 000000000..46e553e44 --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioOCD.zul @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + +