From ba32335f6143e88eb9ea042e1cbf567235945872 Mon Sep 17 00:00:00 2001 From: gleimar Date: Wed, 27 Jul 2016 14:49:57 +0000 Subject: [PATCH] fixes bug#7663 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@58328 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioTripulacao.java | 26 ++- .../RelatorioTripulacao_es.properties | 4 +- .../templates/RelatorioTripulacao.jasper | Bin 37216 -> 35785 bytes .../templates/RelatorioTripulacao.jrxml | 221 ++++++++---------- 4 files changed, 123 insertions(+), 128 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTripulacao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTripulacao.java index 9d78b98c0..3d8107247 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTripulacao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTripulacao.java @@ -1,28 +1,29 @@ package com.rjconsultores.ventaboletos.relatorios.impl; import java.sql.Connection; -import java.util.Date; import java.sql.ResultSet; import java.sql.SQLException; import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Map; +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +import org.apache.commons.beanutils.BeanComparator; +import org.apache.commons.collections.comparators.ComparatorChain; import org.zkoss.util.resource.Labels; import com.rjconsultores.ventaboletos.entidad.Empleado; import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.TipoEmpleado; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioTripulacaoBean; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; -import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; - public class RelatorioTripulacao extends Relatorio { private static final short CONDUCTOR = 0; private static final short GUARDIA = 1; @@ -53,10 +54,21 @@ public class RelatorioTripulacao extends Relatorio { lsDadosRelatorio.addAll(executeStatement(GUARDIA)); } + ordenar(); setDadosRelatorio(lsDadosRelatorio); } }); } + private void ordenar(){ + ComparatorChain cc = new ComparatorChain(); + cc.addComparator(new BeanComparator("tipoEmpleadoTramo")); + cc.addComparator(new BeanComparator("nomeEmpleado")); + cc.addComparator(new BeanComparator("idEmpleado")); + cc.addComparator(new BeanComparator("fecha")); + cc.addComparator(new BeanComparator("hora")); + + Collections.sort(lsDadosRelatorio,cc); + } private List executeStatement(Short tipoTripulacao) throws SQLException, ParseException { String tipoEmpleadoTramo; @@ -94,8 +106,8 @@ public class RelatorioTripulacao extends Relatorio { System.out.println(sql.toString()); NamedParameterStatement stmt = new NamedParameterStatement(conexaoRelatorio, sql.toString()); - stmt.setDate("fecInicio", new java.sql.Date((DateUtil.inicioFecha(fecInicio)).getTime())); - stmt.setDate("fecFinal", new java.sql.Date((DateUtil.fimFecha(fecFinal).getTime()))); + stmt.setDate("fecInicio", new java.sql.Date(fecInicio.getTime())); + stmt.setDate("fecFinal", new java.sql.Date(fecFinal.getTime())); stmt.setLong("empleadoId", empleado != null ? empleado.getEmpleadoId() : 0); stmt.setLong("empresaId", empresa != null ? empresa.getEmpresaId() : 0); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_es.properties index 8f3fb2f3a..d705755db 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_es.properties @@ -4,9 +4,9 @@ label.tipoEmpleadoTramo=Functi\u00F3n Ejercido msg.a=a #Labels header -header.pagina=Página\: +header.pagina=P\u00E1gina\: header.data.hora=Data/Hora\: -label.empleadoId=Empleado\: +label.empleadoId=Empleado\ label.empleadoNome=Nombre\: label.tipoEmpregado=Tipo\: diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jasper index ee9760dacf67b671ee063bd7c0abb28e41437e90..b2d40ef50d22c74e1828c0b019db23b5dafde8b9 100644 GIT binary patch delta 10064 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jrxml index 852baaf01..bdd947d79 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jrxml @@ -1,8 +1,9 @@ - - - - + + + + + @@ -28,117 +29,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -227,51 +120,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + +