From c835dbe7fb8affa791f03d093c74547d0fa8d9e1 Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 9 Jun 2021 14:42:51 +0000 Subject: [PATCH] fixes bug#22468 dev:valdir qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@107130 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioLinhasHorario.java | 26 +- .../RelatorioLinhasHorarioSimplificado.java | 8 +- .../templates/RelatorioLinhasHorario.jasper | Bin 115001 -> 115093 bytes .../templates/RelatorioLinhasHorario.jrxml | 416 +++++++++--------- .../RelatorioLinhasHorarioSimplificado.jasper | Bin 86917 -> 86953 bytes .../RelatorioLinhasHorarioSimplificado.jrxml | 274 ++++++------ .../EditarCatalogoDeRutaController.java | 2 +- .../RelatorioAproveitamentoController.java | 2 +- .../RelatorioLinhasHorarioController.java | 8 +- .../RelatorioResumoLinhasController.java | 4 +- .../filtroRelatorioLinhasHorario.zul | 2 +- 11 files changed, 372 insertions(+), 370 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index 0563edfb9..187446460 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -4,13 +4,11 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.Connection; import java.sql.ResultSet; -import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; -import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; - import org.apache.log4j.Logger; import com.rjconsultores.ventaboletos.entidad.Corrida; @@ -21,9 +19,12 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioLinhasHorarioBean; import com.rjconsultores.ventaboletos.service.ConstanteService; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + @SuppressWarnings({"unused", "unchecked"}) public class RelatorioLinhasHorario extends Relatorio { @@ -85,8 +86,15 @@ public class RelatorioLinhasHorario extends Relatorio { NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); ResultSet rset = null; - stmt.setTimestamp("DATA_INICIO", (Timestamp) parametros.get("DATA_INICIO")); - stmt.setTimestamp("DATA_FINAL", (Timestamp) parametros.get("DATA_FINAL")); + if (parametros.get("DATA_INICIO") != null) { + Date dataFinal = (Date) parametros.get("DATA_INICIO"); + stmt.setString("DATA_INICIO", DateUtil.getStringDate(dataFinal, DateUtil.ddMMaaHH24mmss)); + } + + if (parametros.get("DATA_FINAL") != null) { + Date dataFinal = (Date) parametros.get("DATA_FINAL"); + stmt.setString("DATA_FINAL", DateUtil.getStringDate(dataFinal, DateUtil.ddMMaaHH24mmss)); + } rset = stmt.executeQuery(); @@ -495,7 +503,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" WHERE "); sql.append(" EXISTS (SELECT * FROM CAJA CA WHERE CA.CORRIDA_ID = C.CORRIDA_ID AND CA.FECCORRIDA = C.FECCORRIDA AND CA.MOTIVOCANCELACION_ID IS NULL) "); - sql.append(" AND C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); + sql.append(" AND C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'dd/mm/yyyy hh24:mi:ss') "); sql.append(" GROUP BY C.CORRIDA_ID, C.CORRIDA2_ID, "); sql.append(" C.ROLOPERATIVO_ID, "); sql.append(" c.ruta_id, "); @@ -534,7 +542,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = TF.VIGENCIATARIFA_ID AND C.FECCORRIDA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ) "); - sql.append(" WHERE C.ACTIVO = 1 AND C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); + sql.append(" WHERE C.ACTIVO = 1 AND C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'dd/mm/yyyy hh24:mi:ss') "); if (lsNumServico.size() > 0) { for (Corrida corrida : lsNumServico) { @@ -595,7 +603,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" AND T.ACTIVO = 1"); sql.append(" AND BO.INDSTATUSBOLETO != 'S' AND BO.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND BO.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); - sql.append(" AND BO.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); + sql.append(" AND BO.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'dd/mm/yyyy hh24:mi:ss') "); if (lsNumServico.size() > 0) { for (Corrida corrida : lsNumServico) { @@ -615,7 +623,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" ON (CJ.CORRIDA_ID = C.CORRIDA_ID AND (CJ.CORRIDA2_ID=C.CORRIDA2_ID OR (CJ.CORRIDA2_ID IS NULL AND C.CORRIDA2_ID IS NULL)) AND CJ.FECCORRIDA = C.FECCORRIDA AND CJ.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID "); sql.append(" AND CJ.RUTA_ID = C.RUTA_ID AND CJ.EMPRESACORRIDA_ID = C.EMPRESACORRIDA_ID AND CJ.TARIFA=TF.PRECIO ) "); - sql.append(" WHERE C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); + sql.append(" WHERE C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'dd/mm/yyyy hh24:mi:ss') "); if (lsNumServico.size() > 0) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java index 2a8307b55..38d132b63 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java @@ -492,7 +492,7 @@ public class RelatorioLinhasHorarioSimplificado extends Relatorio { sql.append(" WHERE "); sql.append(" EXISTS (SELECT * FROM CAJA CA WHERE CA.CORRIDA_ID = C.CORRIDA_ID AND CA.FECCORRIDA = C.FECCORRIDA AND CA.MOTIVOCANCELACION_ID IS NULL) "); - sql.append(" AND C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'DD/MM/YY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'DD/MM/YY hh24:mi:ss') "); + sql.append(" AND C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'DD/MM/YYYY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'DD/MM/YYYY hh24:mi:ss') "); sql.append(" GROUP BY C.CORRIDA_ID, "); sql.append(" C.ROLOPERATIVO_ID, "); sql.append(" c.ruta_id, "); @@ -518,7 +518,7 @@ public class RelatorioLinhasHorarioSimplificado extends Relatorio { sql.append(" LEFT JOIN BOLETO B ON (B.CORRIDA_ID = C.CORRIDA_ID AND B.FECCORRIDA = C.FECCORRIDA AND B.ACTIVO = 1 AND B.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND (B.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA).append(" OR PORCCATEGORIA = 100)) "); sql.append(" WHERE C.ACTIVO = 1 "); - sql.append(" AND C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'DD/MM/YY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'DD/MM/YY hh24:mi:ss') "); + sql.append(" AND C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'DD/MM/YYYY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'DD/MM/YYYY hh24:mi:ss') "); if (lsNumServico.size() > 0) { for (Corrida corrida : lsNumServico) { @@ -565,7 +565,7 @@ public class RelatorioLinhasHorarioSimplificado extends Relatorio { sql.append(" AND T.ACTIVO = 1"); sql.append(" AND BO.INDSTATUSBOLETO != 'S' AND BO.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND BO.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); - sql.append(" AND BO.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'DD/MM/YY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'DD/MM/YY hh24:mi:ss') "); + sql.append(" AND BO.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'DD/MM/YYYY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'DD/MM/YYYY hh24:mi:ss') "); if (lsNumServico.size() > 0) { for (Corrida corrida : lsNumServico) { @@ -603,7 +603,7 @@ public class RelatorioLinhasHorarioSimplificado extends Relatorio { sql.append(") TB5 ON TB5.RUTA_ID = C.RUTA_ID "); sql.append("AND TB5.ORIGEN_ID = ORIGEM.PARADA_ID "); sql.append("AND TB5.DESTINO_ID = DESTINO.PARADA_ID "); - sql.append(" WHERE C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'DD/MM/YY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'DD/MM/YY hh24:mi:ss') "); + sql.append(" WHERE C.FECCORRIDA BETWEEN TO_DATE(:DATA_INICIO, 'DD/MM/YYYY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'DD/MM/YYYY hh24:mi:ss') "); sql.append(" AND (TF.TARIFA_ID IS NULL OR (TF.TARIFA_ID IS NOT NULL AND C.FECCORRIDA BETWEEN VTF.FECINICIOVIGENCIA AND VTF.FECFINVIGENCIA )) "); sql.append(" "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper index 1b2366876b94229f2c28288054ab2b092ea560bf..d0e127d136480f0066d5bb3fcd9d35cee5727b24 100644 GIT binary patch delta 21646 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 delta 21298 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 DC>T3+ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml index f109cae12..1d5af80a4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml @@ -1,13 +1,13 @@ - - - + + + - + - + @@ -256,143 +256,143 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -429,144 +429,144 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + @@ -587,7 +587,7 @@ - + @@ -597,34 +597,34 @@ - + - + - + - + - + - + @@ -690,84 +690,84 @@ - + - + - + - - + + - + - + - + - + - + - + - + - + @@ -819,7 +819,7 @@ - + @@ -907,196 +907,196 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -1115,134 +1115,134 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - + + - + + + + + + + + - - + + - - + + - - + + - - + + - - + + @@ -1255,8 +1255,8 @@ - - + + @@ -1267,7 +1267,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jasper index 882ca89dfff76df8a5de4fbc868c0864356ed268..8d0ef5e11f4700e4d7f2d692bbdc16d8d8c9a014 100644 GIT binary patch delta 18424 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 delta 17394 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 - - - + + + - + - + @@ -199,7 +199,7 @@ - + @@ -220,67 +220,67 @@ - + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + @@ -300,7 +300,7 @@ - + @@ -316,68 +316,68 @@ - - + + - - + + - - + + - - - + + + - + - - + + - - + + - - + + - - + + - - - + + + @@ -401,7 +401,7 @@ - + @@ -410,65 +410,65 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + @@ -540,27 +540,27 @@ - + - + - + - + - + @@ -584,29 +584,29 @@ - + - + - + - - + + @@ -644,45 +644,45 @@ - + - + - + - + - + - + - + @@ -702,106 +702,106 @@ - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - + @@ -820,22 +820,22 @@ - - + + - - + + - - + + @@ -849,43 +849,43 @@ - - + + - - + + - - + + - - + + - - + + - - - + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java index 62ebf0284..a665e1066 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java @@ -494,7 +494,7 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer + " " + corrida.getId().getCorridaId() + " " + Labels.getLabel("editarCatalogoDeRutaController.msg.corridaGeradaVigentePt2") - + " " + DateUtil.getStringDate(corrida.getId().getFeccorrida(), DateUtil.ddMMaa)); + + " " + DateUtil.getStringDate(corrida.getId().getFeccorrida(), DateUtil.ddMMaaaa)); return true; } return false; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoController.java index 2f01133b4..39e240dd3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoController.java @@ -275,7 +275,7 @@ public class RelatorioAproveitamentoController extends MyGenericForwardComposer } parametros.put("CORRIDA_ID", this.txtCorridaId.getValue()); - parametros.put("FECCORRIDA", DateUtil.getStringDate(this.fecCorrida.getValue(), DateUtil.ddMMaa)); + parametros.put("FECCORRIDA", DateUtil.getStringDate(this.fecCorrida.getValue(), DateUtil.ddMMaaaa)); parametros.put("DATA", DateUtil.getStringDate(this.fecCorrida.getValue())); // Utilizada para exibição no cabeçalho parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioAproveitamentoController.window.title")); 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 f7258945a..0cdda5569 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 @@ -1,6 +1,5 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -116,11 +115,8 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer { parametros.put("TIPOSERVICIO_ID", tipoServico); - Timestamp dataInicio = new Timestamp((DateUtil.inicioFecha((java.util.Date) this.datInicial.getValue()).getTime())); - Timestamp dataFinal = new Timestamp((DateUtil.fimFecha((java.util.Date) this.datFinal.getValue()).getTime())); - - parametros.put("DATA_INICIO", dataInicio); - parametros.put("DATA_FINAL", dataFinal); + parametros.put("DATA_INICIO", DateUtil.inicioFecha(this.datInicial.getValue())); + parametros.put("DATA_FINAL", DateUtil.fimFecha(this.datFinal.getValue())); parametros.put("ISSIMPLIFICADO", chkSimplificado.isChecked()); parametros.put("USUARIO_ID", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java index 85989dbce..877540131 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java @@ -129,7 +129,7 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer { parametros.put("DATA", new Date()); parametros.put("FILTROS", filtro.toString()); - String tituloRelatorio = ""; + String tituloRelatorio = "relatorioResumoLinhasController.window.title"; if (rdAnalitico.isChecked()) { if(chcSumarizar.isChecked()) { relatorio = new RelatorioResumoLinhasAnaliticoSumarizado(parametros, dataSourceRead.getConnection()); @@ -139,8 +139,6 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer { tituloRelatorio = "relatorioResumoLinhasAnaliticoSumarizadoSimplificadoController.window.title"; }else { relatorio = new RelatorioResumoLinhasAnalitico(parametros, dataSourceRead.getConnection()); - tituloRelatorio = "relatorioResumoLinhasController.window.title"; - } }else { relatorio = new RelatorioResumoLinhas(parametros, dataSourceRead.getConnection()); diff --git a/web/gui/relatorios/filtroRelatorioLinhasHorario.zul b/web/gui/relatorios/filtroRelatorioLinhasHorario.zul index 57d69a0ea..f10f8df10 100644 --- a/web/gui/relatorios/filtroRelatorioLinhasHorario.zul +++ b/web/gui/relatorios/filtroRelatorioLinhasHorario.zul @@ -7,7 +7,7 @@