From 93303f83042a32216160c586675870b007fb0080 Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Thu, 18 Jun 2015 12:27:01 +0000 Subject: [PATCH] =?UTF-8?q?Apenas=20retirei=20linhas=20comentadas,=20impor?= =?UTF-8?q?ts=20desnecess=C3=A1rios,=20e=20dei=20uma=20pequena=20melhorada?= =?UTF-8?q?=20no=20layout=20do=20jasper?= 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@45122 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioReceitaServico.java | 21 ++----------- .../templates/RelatorioReceitaServico.jasper | Bin 43511 -> 43707 bytes .../templates/RelatorioReceitaServico.jrxml | 28 ++++++++++-------- .../RelatorioReceitaServicoController.java | 26 ---------------- 4 files changed, 18 insertions(+), 57 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java index 2c07100e6..2c42fdbfb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java @@ -1,6 +1,5 @@ package com.rjconsultores.ventaboletos.relatorios.impl; -import java.math.BigDecimal; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Timestamp; @@ -8,11 +7,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import com.rjconsultores.ventaboletos.relatorios.negocio.CalculoImposto; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; -import com.rjconsultores.ventaboletos.relatorios.utilitarios.ExceptionConfiguracao; 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 { @@ -26,8 +22,7 @@ public class RelatorioReceitaServico extends Relatorio { public void initDados() throws Exception { Connection conexao = this.relatorio.getConexao(); Map parametros = this.relatorio.getParametros(); -// String puntosVentaIds = (String) parametros.get("NUMPUNTOVENTA"); - + String sql = getSql( (parametros.get("ORIGEN_ID") != null && parametros.get("ORIGEN_ID") != "" ) , (parametros.get("DESTINO_ID") != null && parametros.get("DESTINO_ID") != "" ) , @@ -36,25 +31,18 @@ public class RelatorioReceitaServico extends Relatorio { 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())); stmt.setTimestamp("DATA_INICIAL", new Timestamp(((Date) parametros.get("DATA_INICIAL")).getTime())); stmt.setTimestamp("DATA_FINAL", new Timestamp(((Date) parametros.get("DATA_FINAL")).getTime())); if (parametros.get("CORRIDA_ID") != null) stmt.setString("CORRIDA_ID", (String)parametros.get("CORRIDA_ID")); - else{} if (parametros.get("ORIGEN_ID") != null) stmt.setInt("ORIGEN_ID", (Integer) parametros.get("ORIGEN_ID")); - else{} - // stmt.setNull("ORIGEN_ID", java.sql.Types.INTEGER); - + if (parametros.get("DESTINO_ID") != null) stmt.setInt("DESTINO_ID", (Integer) parametros.get("DESTINO_ID")); - else{} - //stmt.setNull("DESTINO_ID", java.sql.Types.INTEGER); if (parametros.get("EMPRESA_ID") != null) stmt.setInt("EMPRESA_ID", (Integer) parametros.get("EMPRESA_ID")); @@ -133,13 +121,8 @@ public class RelatorioReceitaServico extends Relatorio { sql.append(" and cj.feccorrida <= :DATA_FINAL "); if(servicoSelected){ sql.append(" and cj.corrida_id IN (:CORRIDA_ID) "); } - //else{ sql.append(" and cj.corrida_id IN ( select p.PARADA_ID from parada p ) "); } - if(origemSelected){ sql.append(" and pOrig.PARADA_ID IN (:ORIGEN_ID) "); } - else{ sql.append(" and pOrig.PARADA_ID IN ( select p.PARADA_ID from parada p ) "); } - if(destinoSelected){ sql.append(" and pDest.PARADA_ID IN (:DESTINO_ID) "); } - else{ sql.append(" and pDest.PARADA_ID IN ( select p.PARADA_ID from parada p) "); } sql.append(" and mar.EMPRESA_ID = :EMPRESA_ID "); sql.append(" and cj.CLASESERVICIO_ID = :CLASESERVICIO_ID "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper index 1f63c2c76d769580841cd767fc4c0f9beac8fb0a..f915a0ff05029ec8068373d77d1e664a475f9f45 100644 GIT binary patch delta 10700 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 - + @@ -210,7 +210,7 @@ - + @@ -322,7 +322,7 @@ - + @@ -366,40 +366,44 @@ - + - + - + - + - + - + + - + + - + + - + + 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 3ab10bdcb..af3f9c10a 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 @@ -1,6 +1,5 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; -import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.HashMap; import java.util.List; @@ -21,14 +20,8 @@ import org.zkoss.zul.Datebox; import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.GrupoRuta; import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioOCDNaoResgatadaEmpresa; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioReceitaServico; -import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioResumoLinhas; -import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioResumoLinhasAnalitico; -import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioTaxasLinha; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.ClaseServicioService; import com.rjconsultores.ventaboletos.service.EmpresaService; @@ -175,7 +168,6 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer Parada origem = (Parada) cbiOrigem.getValue(); parametros.put("ORIGEN_ID", origem.getParadaId()); filtro.append("Origem: "+origem.getCveparada()+"; "); - //filtro.append(origem.getCveparada() + ";"); } else { parametros.put("ORIGEN_ID", null);// filtro.append("Origem: Todos; "); @@ -186,7 +178,6 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer Parada destino = (Parada) cbiDestino.getValue(); parametros.put("DESTINO_ID", destino.getParadaId()); filtro.append("Destino: "+destino.getCveparada()+"; "); - //filtro.append(destino.getCveparada() + ";"); } else { parametros.put("DESTINO_ID", null); filtro.append("Destino: Todos; "); @@ -197,7 +188,6 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer Empresa empresa = (Empresa) itemEmpresa.getValue(); parametros.put("EMPRESA_ID", empresa.getEmpresaId()); filtro.append("Empresa: "+empresa.getNombempresa()+"; "); - //filtro.append(empresa.getNombempresa() + ";"); } else { parametros.put("EMPRESA_ID", ""); } @@ -207,7 +197,6 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer ClaseServicio clase = (ClaseServicio) itemClasse.getValue(); parametros.put("CLASESERVICIO_ID", clase.getClaseservicioId()); filtro.append("Classe: "+clase.getDescclase()+"; "); - //filtro.append(empresa.getNombempresa() + ";"); } else { parametros.put("CLASESERVICIO_ID", ""); } @@ -219,26 +208,11 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer relatorio = new RelatorioReceitaServico(parametros, dataSourceRead.getConnection()); -// if(relatorio.getCustomDataSource().next()) -// { Map args = new HashMap(); args.put("relatorio", relatorio); openWindow("/component/reportView.zul", Labels.getLabel("relatorioReceitaServicoController.window.title"), args, MODAL); -// }else -// { -// try { -// Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), -// Labels.getLabel("relatorioReceitaServicoController.window.title"), -// Messagebox.OK, Messagebox.INFORMATION); -// } catch (InterruptedException ex) { -// ex.printStackTrace(); -// } -// } - - - } }