From 7a565d3980119cc609127389e3ca5b05c45008af Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Mon, 13 Jul 2015 14:02:48 +0000 Subject: [PATCH] FIXES BUG #6440 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45969 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioDiferencasTransferencias.java | 94 +++++++++ .../impl/RelatorioReceitaServico.java | 88 ++++---- ...orioDiferencasTransferencias_es.properties | 12 ++ ...orioDiferencasTransferencias_pt.properties | 12 ++ .../RelatorioDiferencasTransferencias.jasper | Bin 0 -> 29619 bytes .../RelatorioDiferencasTransferencias.jrxml | 192 ++++++++++++++++++ .../templates/RelatorioReceitaServico.jrxml | 113 ++++++----- ...rioDiferencasTransferenciasController.java | 120 +++++++++++ .../RelatorioReceitaServicoController.java | 129 ++++++------ ...MenuRelatorioDiferencasTransferencias.java | 25 +++ web/WEB-INF/i3-label_es_MX.label | 6 + web/WEB-INF/i3-label_pt_BR.label | 6 + ...iltroRelatorioDiferencasTransferencias.zul | 40 ++++ 13 files changed, 674 insertions(+), 163 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDiferencasTransferencias.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDiferencasTransferencias_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDiferencasTransferencias_pt.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDiferencasTransferencias.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDiferencasTransferencias.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDiferencasTransferenciasController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioDiferencasTransferencias.java create mode 100644 web/gui/relatorios/filtroRelatorioDiferencasTransferencias.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDiferencasTransferencias.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDiferencasTransferencias.java new file mode 100644 index 000000000..5ee11db60 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDiferencasTransferencias.java @@ -0,0 +1,94 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Timestamp; +import java.util.Date; +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.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +public class RelatorioDiferencasTransferencias extends Relatorio { + + public RelatorioDiferencasTransferencias(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); + + stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); + stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); + + ResultSet rset = stmt.executeQuery(); + + while (rset.next()) { + + Map dataResult = new HashMap(); + + dataResult.put("classe_original", rset.getString("classe_original")); + dataResult.put("total_pago_original", rset.getBigDecimal("total_pago_original")); + dataResult.put("classe_novo", rset.getString("classe_novo")); + dataResult.put("diferença_preço", rset.getBigDecimal("diferença_preço")); + + this.dados.add(dataResult); + } + + this.resultSet = rset; + } + }); + } + + @Override + protected void processaParametros() throws Exception { + } + + private String getSql() { + StringBuilder sql = new StringBuilder(); + + sql.append(" SELECT CS_ORIG.DESCCLASE AS classe_original, "); + sql.append(" ( B_ORIG.PRECIOPAGADO + B_ORIG.IMPORTETAXAEMBARQUE + B_ORIG.IMPORTEPEDAGIO + B_ORIG.IMPORTEOUTROS + B_ORIG.IMPORTESEGURO ) AS total_pago_original, "); + sql.append(" CS_NOVO.DESCCLASE AS classe_novo, "); + sql.append(" (CASE WHEN ee.tipoeventoextra_id = 62 THEN ( -1 * (ee.IMPINGRESO) ) ELSE (ee.IMPINGRESO) END) AS diferença_preço "); + sql.append(" FROM BOLETO B_NOVO "); + + sql.append(" INNER JOIN CAJA_DIVERSOS CD "); + sql.append(" ON CD.NUMOPERACION = B_NOVO.NUMOPERACION"); + sql.append(" INNER JOIN EVENTO_EXTRA EE "); + sql.append(" ON EE.EVENTOEXTRA_ID = CD.EVENTOEXTRA_ID "); + sql.append(" INNER JOIN TIPO_EVENTO_EXTRA TEE "); + sql.append(" ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID "); + sql.append(" AND EE.TIPOEVENTOEXTRA_ID IN (62 , 63) "); + sql.append(" INNER JOIN BOLETO B_ORIG "); + sql.append(" ON B_ORIG.BOLETO_ID = B_NOVO.BOLETOORIGINAL_ID "); + sql.append(" INNER JOIN CLASE_SERVICIO CS_NOVO "); + sql.append(" ON CS_NOVO.CLASESERVICIO_ID = B_NOVO.CLASESERVICIO_ID "); + sql.append(" INNER JOIN CLASE_SERVICIO CS_ORIG "); + sql.append(" ON CS_ORIG.CLASESERVICIO_ID = B_ORIG.CLASESERVICIO_ID "); + + sql.append("WHERE B_NOVO.INDSTATUSBOLETO LIKE 'T' "); + sql.append(" AND B_NOVO.FECHORVENTA >= :DATA_INICIAL "); + sql.append(" AND B_NOVO.FECHORVENTA <= :DATA_FINAL "); + sql.append(" AND B_NOVO.BOLETOORIGINAL_ID IS NOT NULL "); + sql.append(" ORDER BY "); + sql.append(" CASE "); + sql.append(" WHEN cs_orig.DESCCLASE = cs_novo.DESCCLASE THEN 1 "); + sql.append(" WHEN cs_orig.DESCCLASE <> cs_novo.DESCCLASE THEN 2 "); + sql.append(" ELSE 3 "); + sql.append(" END asc "); + + return sql.toString(); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java index 82e13c842..5d8233c04 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java @@ -9,51 +9,51 @@ import java.util.Map; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioReceitaServico extends Relatorio { - - public RelatorioReceitaServico(Map parametros, Connection conexao) throws Exception + + public RelatorioReceitaServico(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( - (parametros.get("ORIGEN_ID") != null && parametros.get("ORIGEN_ID") != "" ) , - (parametros.get("DESTINO_ID") != null && parametros.get("DESTINO_ID") != "" ) , - (parametros.get("CORRIDA_ID") != null && parametros.get("CORRIDA_ID") != "" ) , - (parametros.get("CLASESERVICIO_ID") != null && parametros.get("CLASESERVICIO_ID") != "" ) + (parametros.get("ORIGEN_ID") != null && parametros.get("ORIGEN_ID") != ""), + (parametros.get("DESTINO_ID") != null && parametros.get("DESTINO_ID") != ""), + (parametros.get("CORRIDA_ID") != null && parametros.get("CORRIDA_ID") != ""), + (parametros.get("CLASESERVICIO_ID") != null && parametros.get("CLASESERVICIO_ID") != "") ); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); - - stmt.setTimestamp("DATA_INICIAL", new Timestamp(((Date) parametros.get("DATA_INICIAL")).getTime())); - stmt.setTimestamp("DATA_FINAL", new Timestamp(((Date) parametros.get("DATA_FINAL")).getTime())); + stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); + stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); if (parametros.get("CORRIDA_ID") != null) - stmt.setString("CORRIDA_ID", (String)parametros.get("CORRIDA_ID")); - + stmt.setString("CORRIDA_ID", (String) parametros.get("CORRIDA_ID")); + if (parametros.get("ORIGEN_ID") != null) stmt.setInt("ORIGEN_ID", (Integer) parametros.get("ORIGEN_ID")); - + if (parametros.get("DESTINO_ID") != null) stmt.setInt("DESTINO_ID", (Integer) parametros.get("DESTINO_ID")); - + if (parametros.get("EMPRESA_ID") != null) stmt.setInt("EMPRESA_ID", (Integer) parametros.get("EMPRESA_ID")); else stmt.setNull("EMPRESA_ID", java.sql.Types.INTEGER); - - if (parametros.get("CLASESERVICIO_ID") != null && (!parametros.get("CLASESERVICIO_ID").equals("") )) + + if (parametros.get("CLASESERVICIO_ID") != null && (!parametros.get("CLASESERVICIO_ID").equals(""))) stmt.setInt("CLASESERVICIO_ID", (Short) parametros.get("CLASESERVICIO_ID")); -// else -// stmt.setNull("CLASESERVICIO_ID", java.sql.Types.INTEGER); + // else + // stmt.setNull("CLASESERVICIO_ID", java.sql.Types.INTEGER); ResultSet rset = stmt.executeQuery(); @@ -76,7 +76,7 @@ public class RelatorioReceitaServico extends Relatorio { dataResult.put("dataHoraCompra", rset.getTimestamp("dataHoraCompra")); dataResult.put("passageiro", !(rset.getString("passageiro") == null) ? rset.getString("passageiro") : ""); dataResult.put("nrBilhete", !(rset.getString("nrBilhete") == null) ? rset.getString("nrBilhete") : ""); - + this.dados.add(dataResult); } @@ -84,16 +84,14 @@ public class RelatorioReceitaServico extends Relatorio { } }); } - + @Override protected void processaParametros() throws Exception { } - - private String getSql(boolean origemSelected , boolean destinoSelected, boolean servicoSelected, boolean claseServicioSelected ) { + + private String getSql(boolean origemSelected, boolean destinoSelected, boolean servicoSelected, boolean claseServicioSelected) { StringBuilder sql = new StringBuilder(); - - - + sql.append(" select cj.feccorrida as data, "); sql.append(" cj.corrida_id as servico, "); sql.append(" mar.descmarca as empresa , "); @@ -102,38 +100,42 @@ public class RelatorioReceitaServico extends Relatorio { sql.append(" cl_ser.descclase as Classe, "); sql.append(" cj.preciopagado as tarifa, "); sql.append(" cj.importetaxaembarque as tut, "); - sql.append(" cj.importepedagio as pedagio, "); - sql.append(" (cj.preciopagado + cj.importetaxaembarque + cj.importepedagio ) as total, "); + sql.append(" cj.importepedagio as pedagio, "); + sql.append(" (cj.preciopagado + cj.importetaxaembarque + cj.importepedagio ) as total, "); sql.append(" cat.desccategoria as tipo, "); sql.append(" pv.nombpuntoventa as agencia, "); - sql.append(" cj.fechorventa as dataHoraCompra, "); + sql.append(" cj.fechorventa as dataHoraCompra, "); sql.append(" cj.nombpasajero as passageiro, "); sql.append(" cj.NUMFOLIOSISTEMA as nrBilhete "); - + sql.append(" from caja cj "); sql.append(" inner join marca mar on mar.marca_id = cj.marca_id "); sql.append(" inner join parada pOrig on pOrig.parada_id = cj.origen_id "); sql.append(" inner join parada pDest on pDest.parada_id = cj.destino_id "); sql.append(" inner join clase_servicio cl_ser on cl_ser.claseservicio_id = cj.claseservicio_id "); sql.append(" inner join categoria cat on cj.categoria_id = cat.categoria_id "); - sql.append(" inner join punto_venta pv on cj.puntoventa_id = pv.puntoventa_id "); - + sql.append(" inner join punto_venta pv on cj.puntoventa_id = pv.puntoventa_id "); + sql.append(" where cj.feccorrida >= :DATA_INICIAL "); sql.append(" and cj.feccorrida <= :DATA_FINAL "); - - if(servicoSelected){ sql.append(" and cj.corrida_id IN (:CORRIDA_ID) "); } - if(origemSelected){ sql.append(" and pOrig.PARADA_ID IN (:ORIGEN_ID) "); } - if(destinoSelected){ sql.append(" and pDest.PARADA_ID IN (:DESTINO_ID) "); } - + + if (servicoSelected) { + sql.append(" and cj.corrida_id IN (:CORRIDA_ID) "); + } + if (origemSelected) { + sql.append(" and pOrig.PARADA_ID IN (:ORIGEN_ID) "); + } + if (destinoSelected) { + sql.append(" and pDest.PARADA_ID IN (:DESTINO_ID) "); + } + sql.append(" and mar.EMPRESA_ID = :EMPRESA_ID "); - if(claseServicioSelected){ sql.append(" and cj.CLASESERVICIO_ID = :CLASESERVICIO_ID "); } + if (claseServicioSelected) { + sql.append(" and cj.CLASESERVICIO_ID = :CLASESERVICIO_ID "); + } sql.append(" order by cj.feccorrida, cj.corrida_id "); - - - + return sql.toString(); } - - } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDiferencasTransferencias_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDiferencasTransferencias_es.properties new file mode 100644 index 000000000..2cdde92d3 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDiferencasTransferencias_es.properties @@ -0,0 +1,12 @@ +#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: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDiferencasTransferencias_pt.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDiferencasTransferencias_pt.properties new file mode 100644 index 000000000..2cdde92d3 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDiferencasTransferencias_pt.properties @@ -0,0 +1,12 @@ +#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: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDiferencasTransferencias.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDiferencasTransferencias.jasper new file mode 100644 index 0000000000000000000000000000000000000000..e60c031f3a7fd21b2c17d5497081cf9147333683 GIT binary patch literal 29619 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 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDiferencasTransferencias.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDiferencasTransferencias.jrxml new file mode 100644 index 000000000..ea4e05361 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDiferencasTransferencias.jrxml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml index c7e93984a..f713b5bf0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml @@ -1,7 +1,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -84,14 +84,14 @@ - + - + @@ -99,10 +99,10 @@ - + - + @@ -110,7 +110,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -126,10 +126,10 @@ - + - + @@ -140,224 +140,224 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -368,41 +368,44 @@ - + - + + - + + - + + - + - + - + - + @@ -411,7 +414,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDiferencasTransferenciasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDiferencasTransferenciasController.java new file mode 100644 index 000000000..afd88561c --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDiferencasTransferenciasController.java @@ -0,0 +1,120 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.util.Calendar; +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.Component; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.ComboitemRenderer; +import org.zkoss.zul.Datebox; + +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioDiferencasTransferencias; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioReceitaServico; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +@Controller("relatorioDiferencasTransferenciasController") +@Scope("prototype") +public class RelatorioDiferencasTransferenciasController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + + private Datebox datInicial; + private Datebox datFinal; + + @Autowired + private DataSource dataSourceRead; + + 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; + } + + @Override + public void doAfterCompose(Component comp) throws Exception { + + super.doAfterCompose(comp); + } + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + executarRelatorio(); + } + + /** + * @throws Exception + * + */ + @SuppressWarnings({ "rawtypes", "unchecked" }) + private void executarRelatorio() throws Exception { + + if (datInicial != null && datFinal != null && datFinal.getValue().compareTo(datInicial.getValue()) < 0) { + try { + Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), + Labels.getLabel("relatorioDiferencasTransferenciasController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + } catch (InterruptedException ex) { + ex.printStackTrace(); + } + } else + { + Relatorio relatorio; + + Map parametros = new HashMap(); + + StringBuilder filtro = new StringBuilder(); + + filtro.append("Início período: "); + Calendar cal = Calendar.getInstance(); + cal.setTime(datInicial.getValue()); + filtro.append(cal.get(Calendar.DATE) + "/"); + filtro.append((cal.get(Calendar.MONTH) + 1) + "/"); + filtro.append(cal.get(Calendar.YEAR) + "; "); + + filtro.append("Fim período: "); + cal.setTime(datFinal.getValue()); + filtro.append(cal.get(Calendar.DATE) + "/"); + filtro.append((cal.get(Calendar.MONTH) + 1) + "/"); + filtro.append(cal.get(Calendar.YEAR) + "; "); + + parametros.put("DATA_INICIAL", (java.util.Date) datInicial.getValue()); + parametros.put("DATA_FINAL", (java.util.Date) datFinal.getValue()); + + parametros.put("FILTROS", filtro.toString()); + + parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioDiferencasTransferenciasController.window.title")); + parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); + + relatorio = new RelatorioDiferencasTransferencias(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioDiferencasTransferenciasController.window.title"), args, MODAL); + } + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaServicoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaServicoController.java index 90eeb5c12..6520835ca 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaServicoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaServicoController.java @@ -34,11 +34,10 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; @Controller("relatorioReceitaServicoController") @Scope("prototype") -public class RelatorioReceitaServicoController extends MyGenericForwardComposer { - +public class RelatorioReceitaServicoController extends MyGenericForwardComposer { + private static final long serialVersionUID = 1L; - - + private Datebox datInicial; private Datebox datFinal; private MyComboboxParada cmbParadaOrigem; @@ -48,22 +47,22 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer private List lsEmpresa; private List lsClase; private MyTextbox txtCorridaId; - + private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbClase; - + @Autowired private EmpresaService empresaService; @Autowired private ClaseServicioService claseService; @Autowired private DataSource dataSourceRead; - + @Override public void doAfterCompose(Component comp) throws Exception { lsEmpresa = empresaService.obtenerTodos(); lsClase = claseService.obtenerTodos(); - + super.doAfterCompose(comp); cmbParadaOrigemCve.setItemRenderer(new ComboitemRenderer() { @Override @@ -84,10 +83,9 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer cmbtm.setValue(parada); } }); - - + } - + public void onSelect$cmbParadaOrigemCve(Event ev) { if (cmbParadaOrigemCve.getSelectedItem() != null) { cmbParadaOrigem.setComboItemByParada((Parada) cmbParadaOrigemCve.getSelectedItem().getValue()); @@ -110,16 +108,15 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer cmbParadaDestinoCve.setComboItemByParada((Parada) cmbParadaDestino.getSelectedItem().getValue()); } } - - + /** * @throws Exception * */ @SuppressWarnings({ "rawtypes", "unchecked" }) private void executarRelatorio() throws Exception { - - if (datInicial != null && datFinal != null && datFinal.getValue().compareTo(datInicial.getValue()) < 0 ) { + + if (datInicial != null && datFinal != null && datFinal.getValue().compareTo(datInicial.getValue()) < 0) { try { Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), Labels.getLabel("relatorioReceitaServicoController.window.title"), @@ -127,110 +124,113 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer } catch (InterruptedException ex) { ex.printStackTrace(); } - }else + } else { Relatorio relatorio; - + Map parametros = new HashMap(); - + StringBuilder filtro = new StringBuilder(); - if(null != txtCorridaId.getValue() && !("".equals(txtCorridaId.getValue()))) + if (null != txtCorridaId.getValue() && !("".equals(txtCorridaId.getValue()))) { filtro.append("Serviço: "); - filtro.append(txtCorridaId.getValue()+"; "); + filtro.append(txtCorridaId.getValue() + "; "); parametros.put("CORRIDA_ID", txtCorridaId.getValue()); - }else{ + } else { filtro.append("Serviço: TODOS; "); parametros.put("CORRIDA_ID", null); } - - - + filtro.append("Início período: "); Calendar cal = Calendar.getInstance(); cal.setTime(datInicial.getValue()); - filtro.append(cal.get(Calendar.DATE)+"/"); - filtro.append((cal.get(Calendar.MONTH)+1)+"/"); - filtro.append(cal.get(Calendar.YEAR)+"; "); - + filtro.append(cal.get(Calendar.DATE) + "/"); + filtro.append((cal.get(Calendar.MONTH) + 1) + "/"); + filtro.append(cal.get(Calendar.YEAR) + "; "); + filtro.append("Fim período: "); cal.setTime(datFinal.getValue()); - filtro.append(cal.get(Calendar.DATE)+"/"); - filtro.append((cal.get(Calendar.MONTH)+1)+"/"); - filtro.append(cal.get(Calendar.YEAR)+"; "); - + filtro.append(cal.get(Calendar.DATE) + "/"); + filtro.append((cal.get(Calendar.MONTH) + 1) + "/"); + filtro.append(cal.get(Calendar.YEAR) + "; "); + parametros.put("DATA_INICIAL", (java.util.Date) datInicial.getValue()); parametros.put("DATA_FINAL", (java.util.Date) datFinal.getValue()); - + Comboitem cbiOrigem = cmbParadaOrigem.getSelectedItem(); if (cbiOrigem != null) { Parada origem = (Parada) cbiOrigem.getValue(); - if(origem.getParadaId() != -1){ + if (origem.getParadaId() != -1) { parametros.put("ORIGEN_ID", origem.getParadaId()); - filtro.append("Origem: "+origem.getCveparada()+"; "); + filtro.append("Origem: " + origem.getCveparada() + "; "); } - else{parametros.put("ORIGEN_ID", null); + else { + parametros.put("ORIGEN_ID", null); filtro.append("Origem: Todas; "); - } + } } else { parametros.put("ORIGEN_ID", null); filtro.append("Origem: Todas; "); } - + Comboitem cbiDestino = cmbParadaDestino.getSelectedItem(); if (cbiDestino != null) { Parada destino = (Parada) cbiDestino.getValue(); - if(destino.getParadaId() != -1) - { parametros.put("DESTINO_ID", destino.getParadaId()); - filtro.append("Destino: "+destino.getCveparada()+"; "); - }else{parametros.put("DESTINO_ID", null); - filtro.append("Destino: Todos; "); - } - + if (destino.getParadaId() != -1) + { + parametros.put("DESTINO_ID", destino.getParadaId()); + filtro.append("Destino: " + destino.getCveparada() + "; "); + } else { + parametros.put("DESTINO_ID", null); + filtro.append("Destino: Todos; "); + } + } else { parametros.put("DESTINO_ID", null); filtro.append("Destino: Todos; "); } - + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); if (itemEmpresa != null) { Empresa empresa = (Empresa) itemEmpresa.getValue(); parametros.put("EMPRESA_ID", empresa.getEmpresaId()); - filtro.append("Empresa: "+empresa.getNombempresa()+"; "); + filtro.append("Empresa: " + empresa.getNombempresa() + "; "); } else { parametros.put("EMPRESA_ID", ""); } - + Comboitem itemClasse = cmbClase.getSelectedItem(); if (itemClasse != null) { ClaseServicio clase = (ClaseServicio) itemClasse.getValue(); - if(clase.getClaseservicioId() == -1 ){ + if (clase.getClaseservicioId() == -1) { parametros.put("CLASESERVICIO_ID", ""); - filtro.append("Classe: "+clase.getDescclase()+"; "); - } - else{ parametros.put("CLASESERVICIO_ID", clase.getClaseservicioId()); } - filtro.append("Classe: "+clase.getDescclase()+"; "); + filtro.append("Classe: " + clase.getDescclase() + "; "); + } + else { + parametros.put("CLASESERVICIO_ID", clase.getClaseservicioId()); + } + filtro.append("Classe: " + clase.getDescclase() + "; "); } else { parametros.put("CLASESERVICIO_ID", ""); filtro.append("Classe: TODAS; "); } - + parametros.put("FILTROS", filtro.toString()); - + parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioReceitaServicoController.window.title")); parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); - - relatorio = new RelatorioReceitaServico(parametros, dataSourceRead.getConnection()); - - Map args = new HashMap(); - args.put("relatorio", relatorio); - openWindow("/component/reportView.zul", - Labels.getLabel("relatorioReceitaServicoController.window.title"), args, MODAL); + relatorio = new RelatorioReceitaServico(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioReceitaServicoController.window.title"), args, MODAL); } } - + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { executarRelatorio(); } @@ -338,6 +338,5 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer public void setTxtCorridaId(MyTextbox txtCorridaId) { this.txtCorridaId = txtCorridaId; } - - + } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioDiferencasTransferencias.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioDiferencasTransferencias.java new file mode 100644 index 000000000..88fc0100b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioDiferencasTransferencias.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 ItemMenuRelatorioDiferencasTransferencias extends DefaultItemMenuSistema { + + public ItemMenuRelatorioDiferencasTransferencias() { + super("indexController.mniRelatorioDiferencasTransferencias.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIODIFERENCASTRANSFERENCIAS"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioDiferencasTransferencias.zul", + Labels.getLabel("relatorioDiferencasTransferenciasController.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 5ebe6696e..fc938f720 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -246,6 +246,7 @@ indexController.mniPrecoApanhe.label = Preço Apanhe indexController.mniRelatorioVendasPacotesResumido.label = Ventas de Paquetes - Resumido indexController.mniRelatorioVendasPacotesDetalhado.label = Ventas de Paquetes - Detalhado indexController.mniRelatorioVendasPacotesBoletos.label = Ventas de Pacotes - Boletos +indexController.mniRelatorioDiferencasTransferencias.label = Relatório de Diferenças em Transferências indexController.mniSubMenuClientePacote.label=Pacote indexController.mniAlterarEnderecoApanhe.label=Alterar Endereço Apanhe @@ -446,6 +447,11 @@ relatorioReceitaServicoController.lbEmpresa.value = Empresa relatorioReceitaServicoController.lbClase.value = Clase relatorioReceitaServicoController.lbServico.value = N. Serviço +#Relatorio de Diferencas de Transferencias +relatorioDiferencasTransferenciasController.window.title = Relatório de Diferenças em Transferências +relatorioDiferencasTransferenciasController.lbDePeriodoTransferencia.value = Período de Transferência +relatorioDiferencasTransferenciasController.lbAtePeriodoTransferencia.value = até + # Relatorio Sisdap relatorioSisdapController.window.title=Reporte SISDAP relatorioSisdapController.lbDatInicio.value=Fecha inicio diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index f51b736bc..85b7b99de 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -251,6 +251,7 @@ indexController.mniPrecoApanhe.label = Preço Apanhe indexController.mniRelatorioVendasPacotesResumido.label = Vendas de Pacotes - Resumido indexController.mniRelatorioVendasPacotesDetalhado.label = Vendas de Pacotes - Detalhado indexController.mniRelatorioVendasPacotesBoletos.label = Vendas de Pacotes - Boletos +indexController.mniRelatorioDiferencasTransferencias.label = Relatório de Diferenças em Transferências indexController.mnSubMenuImpressaoFiscal.label=Impressão Fiscal indexController.mnSubMenuRelatorioImpressaoFiscal.label=Relatório Impressão Fiscal @@ -483,6 +484,11 @@ relatorioReceitaServicoController.lbEmpresa.value = Empresa relatorioReceitaServicoController.lbClase.value = Classe relatorioReceitaServicoController.lbServico.value = N. Serviço +#Relatorio de Diferencas de Transferencias +relatorioDiferencasTransferenciasController.window.title = Relatório de Diferenças em Transferências +relatorioDiferencasTransferenciasController.lbDePeriodoTransferencia.value = Período de Transferência +relatorioDiferencasTransferenciasController.lbAtePeriodoTransferencia.value = até + # Relatorio Sisdap relatorioSisdapController.window.title=Relatório SISDAP relatorioSisdapController.lbDatInicio.value=Data Inicio diff --git a/web/gui/relatorios/filtroRelatorioDiferencasTransferencias.zul b/web/gui/relatorios/filtroRelatorioDiferencasTransferencias.zul new file mode 100644 index 000000000..719e51a2f --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioDiferencasTransferencias.zul @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + +