From 041b97d0813930a9f969cac52da16744040029af Mon Sep 17 00:00:00 2001 From: rodrigo Date: Wed, 14 Aug 2013 20:12:10 +0000 Subject: [PATCH] git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29915 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioLinhasHorario.java | 12 ++++++------ .../templates/RelatorioLinhasHorario.jasper | Bin 63315 -> 62894 bytes .../templates/RelatorioLinhasHorario.jrxml | 18 ++++-------------- .../RelatorioLinhasHorarioController.java | 11 ++++------- .../filtroRelatorioLinhasHorario.zul | 2 +- 5 files changed, 15 insertions(+), 28 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index 4095e2421..c27f3badc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -274,7 +274,7 @@ public class RelatorioLinhasHorario extends Relatorio { StringBuffer sql = new StringBuffer(); sql.append(" SELECT "); - sql.append(" NVL(GR.DESCGRUPO, 'Não Informado') AS GRUPO_RUTA, "); + sql.append(" NVL(GR.DESCGRUPO, 'Não Informado') AS GRUPO_RUTA, "); sql.append(" TO_CHAR(CJ.FECHORVIAJE, 'HH24:MI') AS HORA, "); sql.append(" C.CORRIDA_ID AS SERVICO, "); sql.append(" R.INDSENTIDOIDA AS SENTIDO, "); @@ -286,8 +286,8 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" ORIGEM.CVEPARADA AS ORIGEM, "); sql.append(" DESTINO.CVEPARADA AS DESTINO, "); sql.append(" SUM(NVL(EE.IMPINGRESO, 0)) AS BAGAGENS, "); - sql.append(" SUM(NVL(CJ.PRECIOBASE, 0)) AS PASSAGENS, "); - sql.append(" SUM(NVL(CJ.IMPORTETAXAEMBARQUE, 0)) AS SEGURO, "); + sql.append(" SUM(NVL(CJ.PRECIOPAGADO, 0)) AS PASSAGENS, "); + sql.append(" SUM(NVL(CJ.IMPORTESEGURO, 0)) AS SEGURO, "); sql.append(" ORD, "); sql.append(" EXTRA, "); @@ -297,8 +297,8 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" FROM (SELECT RS.RUTA_ID, "); sql.append(" SUM(NVL(T.CANTKMREAL, 0)) AS EXTENSAO "); sql.append(" FROM RUTA_SECUENCIA RS "); - sql.append(" LEFT JOIN TRAMO T "); - sql.append(" ON ( RS.TRAMO_ID = T.TRAMO_ID ) "); + sql.append(" INNER JOIN TRAMO T ON (RS.TRAMO_ID = T.TRAMO_ID) "); + sql.append(" WHERE RS.ACTIVO=1 AND T.ACTIVO=1 "); sql.append(" GROUP BY RS.RUTA_ID) TB1, "); sql.append(" (SELECT C.CORRIDA_ID, "); @@ -342,7 +342,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" ON ( EE.CORRIDA_ID = C.CORRIDA_ID "); sql.append(" AND EE.FECCORRIDA = C.FECCORRIDA "); sql.append(" AND EE.TIPOEVENTOEXTRA_ID = 1 ) "); - sql.append(" WHERE CJ.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); + sql.append(" WHERE CJ.MOTIVOCANCELACION_ID IS NULL AND CJ.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); sql.append(" AND TB1.RUTA_ID = C.RUTA_ID "); sql.append(" AND TB2.CORRIDA_ID = C.CORRIDA_ID "); sql.append(" AND TB3.CORRIDA_ID = C.CORRIDA_ID "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper index 0fe981fe641e5136a76eeca80281e879f3e534b3..ffdde2e83cc1a4c0d452caff9c284828a679774b 100644 GIT binary patch delta 9941 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 delta 9441 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml index 2bd458714..b537c88f3 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml @@ -73,20 +73,10 @@ - - - - - - + - - - - - - + @@ -98,9 +88,9 @@ - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java index 40117db93..ef4a17621 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java @@ -21,6 +21,7 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Combobox; import org.zkoss.zul.Datebox; +import org.zkoss.zul.Intbox; import org.zkoss.zul.Paging; import org.zkoss.zul.Radio; import org.zkoss.zul.Textbox; @@ -75,7 +76,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer { private transient PagedListWrapper plwServico; private MyListbox servicoList; private MyListbox servicoListSelList; - private Textbox txtCorridaId; + private Intbox txtCorridaId; private ArrayList lsNumServico = new ArrayList(); @@ -248,12 +249,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer { private void executarPesquisaServico() { - Integer corridaId = 0; - try { - corridaId = Integer.parseInt(txtCorridaId.getValue()); - } catch (Exception e) { - log.debug(e.getMessage()); - } + Integer corridaId = txtCorridaId.getValue(); servicoList.setData(corridaService.buscarGroupCorrridaId(corridaId, datInicial.getValue(), datFinal.getValue())); @@ -269,6 +265,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer { public void onClick$btnLimparServico(Event ev) { servicoList.clearSelection(); + servicoList.setData(new ArrayList()); lsNumServico.clear(); } diff --git a/web/gui/relatorios/filtroRelatorioLinhasHorario.zul b/web/gui/relatorios/filtroRelatorioLinhasHorario.zul index 7e32b7f6a..3642466d9 100644 --- a/web/gui/relatorios/filtroRelatorioLinhasHorario.zul +++ b/web/gui/relatorios/filtroRelatorioLinhasHorario.zul @@ -50,7 +50,7 @@ - +