fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#7663 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@58328 d1611594-4594-4d17-8e1d-87c2c4800839
master
gleimar 2016-07-27 14:49:57 +00:00
parent 0fbcb42204
commit ba32335f61
4 changed files with 123 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTripulacao.java
View File

@ -1,28 +1,29 @@
package com.rjconsultores.ventaboletos.relatorios.impl; package com.rjconsultores.ventaboletos.relatorios.impl;
import java.sql.Connection; import java.sql.Connection;
import java.util.Date;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; 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 org.zkoss.util.resource.Labels;
import com.rjconsultores.ventaboletos.entidad.Empleado; import com.rjconsultores.ventaboletos.entidad.Empleado;
import com.rjconsultores.ventaboletos.entidad.Empresa; 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.DataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioTripulacaoBean; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioTripulacaoBean;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
public class RelatorioTripulacao extends Relatorio { public class RelatorioTripulacao extends Relatorio {
private static final short CONDUCTOR = 0; private static final short CONDUCTOR = 0;
private static final short GUARDIA = 1; private static final short GUARDIA = 1;
@ -53,10 +54,21 @@ public class RelatorioTripulacao extends Relatorio {
lsDadosRelatorio.addAll(executeStatement(GUARDIA)); lsDadosRelatorio.addAll(executeStatement(GUARDIA));
} }
ordenar();
setDadosRelatorio(lsDadosRelatorio); 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<RelatorioTripulacaoBean> executeStatement(Short tipoTripulacao) throws SQLException, ParseException { private List<RelatorioTripulacaoBean> executeStatement(Short tipoTripulacao) throws SQLException, ParseException {
String tipoEmpleadoTramo; String tipoEmpleadoTramo;
@ -94,8 +106,8 @@ public class RelatorioTripulacao extends Relatorio {
System.out.println(sql.toString()); System.out.println(sql.toString());
NamedParameterStatement stmt = new NamedParameterStatement(conexaoRelatorio, sql.toString()); NamedParameterStatement stmt = new NamedParameterStatement(conexaoRelatorio, sql.toString());
stmt.setDate("fecInicio", new java.sql.Date((DateUtil.inicioFecha(fecInicio)).getTime())); stmt.setDate("fecInicio", new java.sql.Date(fecInicio.getTime()));
stmt.setDate("fecFinal", new java.sql.Date((DateUtil.fimFecha(fecFinal).getTime()))); stmt.setDate("fecFinal", new java.sql.Date(fecFinal.getTime()));
stmt.setLong("empleadoId", empleado != null ? empleado.getEmpleadoId() : 0); stmt.setLong("empleadoId", empleado != null ? empleado.getEmpleadoId() : 0);
stmt.setLong("empresaId", empresa != null ? empresa.getEmpresaId() : 0); stmt.setLong("empresaId", empresa != null ? empresa.getEmpresaId() : 0);

4
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_es.properties
View File

@ -4,9 +4,9 @@ label.tipoEmpleadoTramo=Functi\u00F3n Ejercido
msg.a=a msg.a=a
#Labels header #Labels header
header.pagina=Página\: header.pagina=P\u00E1gina\:
header.data.hora=Data/Hora\: header.data.hora=Data/Hora\:
label.empleadoId=Empleado\: label.empleadoId=Empleado\
label.empleadoNome=Nombre\: label.empleadoNome=Nombre\:
label.tipoEmpregado=Tipo\: label.tipoEmpregado=Tipo\:

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jasper
View File

Binary file not shown.

221
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jrxml
View File

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioTripulacao" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="d5ad1cbf-3b72-40fa-b0c7-0dd4a3aac974"> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioTripulacao" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isIgnorePagination="true" uuid="d5ad1cbf-3b72-40fa-b0c7-0dd4a3aac974">
<property name="ireport.zoom" value="2.853116706110015"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="title"/>
<property name="ireport.x" value="955"/> <property name="ireport.zoom" value="3.452271214393123"/>
<property name="ireport.y" value="23"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<parameter name="titulo" class="java.lang.String" isForPrompting="false"> <parameter name="titulo" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA[]]></defaultValueExpression> <defaultValueExpression><![CDATA[]]></defaultValueExpression>
</parameter> </parameter>
@ -28,117 +29,9 @@
</variable> </variable>
<group name="tipoEmpleadoTramo"> <group name="tipoEmpleadoTramo">
<groupExpression><![CDATA[$F{tipoEmpleadoTramo}]]></groupExpression> <groupExpression><![CDATA[$F{tipoEmpleadoTramo}]]></groupExpression>
<groupHeader>
<band height="16">
<textField>
<reportElement uuid="4089971f-a6c6-43b7-adfb-1d1427a9e570" x="0" y="0" width="120" height="16"/>
<textElement>
<font size="12" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{tipoEmpleadoTramo}]]></textFieldExpression>
</textField>
</band>
</groupHeader>
</group> </group>
<group name="empleado"> <group name="empleado">
<groupExpression><![CDATA[$F{idEmpleado}]]></groupExpression> <groupExpression><![CDATA[$F{idEmpleado}]]></groupExpression>
<groupHeader>
<band height="33">
<textField>
<reportElement uuid="e148679a-25dc-4c96-9497-e872e126abd3" x="13" y="18" width="100" height="14"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.corridaId}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="a9bd4432-bc5f-459b-976a-d7a8f6dfd9a2" x="113" y="18" width="100" height="14"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.fecha}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="703ec7e6-40ca-4cbf-a0a1-295218e08434" x="313" y="18" width="100" height="14"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nomeOrigem}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="3b5a4c87-70ca-4614-bf08-55847461064c" x="413" y="18" width="87" height="14"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nomeDestino}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="24f31a18-4f1a-4371-af7f-fa2b2e5d8d96" x="213" y="18" width="100" height="14"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="6b84c912-0932-4851-aa4c-e1be076ffc6a" x="500" y="18" width="55" height="14"/>
<textElement textAlignment="Right" markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.distanciaKm}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="560ecce1-2a4a-42b2-b2da-ef04ae8b2363" mode="Opaque" x="213" y="0" width="100" height="16" backcolor="#CCCCCC"/>
<textElement>
<font size="10"/>
<paragraph leftIndent="2"/>
</textElement>
<textFieldExpression><![CDATA[$F{nomeEmpleado}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="89628efb-c65d-4fc7-98ab-af7c1e3c9fa5" mode="Opaque" x="155" y="0" width="58" height="16" backcolor="#CCCCCC"/>
<textElement markup="none">
<font size="10" isBold="true"/>
<paragraph leftIndent="2"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.empleadoNome}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="cbdbd675-769a-4cac-af77-0f5876f60864" mode="Opaque" x="85" y="0" width="70" height="16" backcolor="#CCCCCC"/>
<textElement>
<font size="10"/>
</textElement>
<textFieldExpression><![CDATA[$F{idEmpleado}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="cf168ea7-9011-4c9f-a86c-d0dc486b0db1" mode="Opaque" x="13" y="0" width="72" height="16" backcolor="#CCCCCC"/>
<textElement markup="none">
<font size="10" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.empleadoId}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement uuid="d8986d72-7d64-4975-b285-0bfb64f89dfc" mode="Opaque" x="313" y="0" width="114" height="16" backcolor="#CCCCCC"/>
<textElement/>
<textFieldExpression><![CDATA[($F{nomeMaterno})!=null?$F{nomeMaterno}:$F{nomePaterno}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement uuid="d645807f-af86-48ef-9b37-0421b5b22fde" positionType="Float" mode="Opaque" x="427" y="0" width="128" height="16" backcolor="#CCCCCC"/>
<textElement/>
<textFieldExpression><![CDATA[($F{nomeMaterno})!=null?$F{nomePaterno}:null]]></textFieldExpression>
</textField>
</band>
</groupHeader>
<groupFooter>
<band height="19">
<textField pattern="###0.00;-###0.00">
<reportElement uuid="e32a3b63-2efe-4a31-8e9a-dbf7f89a4311" x="499" y="0" width="56" height="14"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{totalKM}]]></textFieldExpression>
</textField>
</band>
</groupFooter>
</group> </group>
<background> <background>
<band splitType="Stretch"/> <band splitType="Stretch"/>
@ -227,51 +120,141 @@
</textField> </textField>
</band> </band>
</title> </title>
<pageHeader>
<band height="14">
<textField>
<reportElement uuid="e148679a-25dc-4c96-9497-e872e126abd3" x="259" y="0" width="100" height="14"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.corridaId}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="a9bd4432-bc5f-459b-976a-d7a8f6dfd9a2" x="359" y="0" width="100" height="14"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.fecha}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="703ec7e6-40ca-4cbf-a0a1-295218e08434" x="559" y="0" width="100" height="14"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nomeOrigem}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="3b5a4c87-70ca-4614-bf08-55847461064c" x="659" y="0" width="87" height="14"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.nomeDestino}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="24f31a18-4f1a-4371-af7f-fa2b2e5d8d96" x="459" y="0" width="100" height="14"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="6b84c912-0932-4851-aa4c-e1be076ffc6a" x="746" y="0" width="55" height="14"/>
<textElement textAlignment="Right" markup="none">
<font isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.distanciaKm}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="89628efb-c65d-4fc7-98ab-af7c1e3c9fa5" mode="Transparent" x="128" y="0" width="131" height="14" backcolor="#FFFFFF"/>
<textElement markup="none">
<font size="14" isBold="true"/>
<paragraph leftIndent="2"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.empleadoNome}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="cf168ea7-9011-4c9f-a86c-d0dc486b0db1" mode="Transparent" x="60" y="0" width="68" height="14" backcolor="#FFFFFF"/>
<textElement markup="none">
<font size="10" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.empleadoId}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="c0b8fcf8-1fcd-4dd2-a00d-549b66100249" x="1" y="0" width="59" height="14"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Tipo]]></text>
</staticText>
</band>
</pageHeader>
<detail> <detail>
<band height="15"> <band height="12">
<textField pattern="dd/MM/yyyy"> <textField pattern="dd/MM/yyyy">
<reportElement uuid="86264348-3c96-4e1c-bfcf-6ae99678ad58" x="113" y="0" width="100" height="12"/> <reportElement uuid="86264348-3c96-4e1c-bfcf-6ae99678ad58" x="359" y="0" width="100" height="12"/>
<textElement> <textElement>
<font size="9"/> <font size="9"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{fecha}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{fecha}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="e29b00a0-9cec-4ab5-af59-7eb97369cfa2" x="313" y="0" width="100" height="12"/> <reportElement uuid="e29b00a0-9cec-4ab5-af59-7eb97369cfa2" x="559" y="0" width="100" height="12"/>
<textElement> <textElement>
<font size="9"/> <font size="9"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{nomeOrigem}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nomeOrigem}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="cf818fc9-459e-4a3f-9c56-48105b3f21ef" x="213" y="0" width="100" height="12"/> <reportElement uuid="cf818fc9-459e-4a3f-9c56-48105b3f21ef" x="459" y="0" width="100" height="12"/>
<textElement> <textElement>
<font size="9"/> <font size="9"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{hora}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{hora}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="914fa266-37c9-49d2-8b33-c34c306ea8fd" x="413" y="0" width="87" height="12"/> <reportElement uuid="914fa266-37c9-49d2-8b33-c34c306ea8fd" x="659" y="0" width="87" height="12"/>
<textElement> <textElement>
<font size="9"/> <font size="9"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{nomeDestino}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nomeDestino}]]></textFieldExpression>
</textField> </textField>
<textField pattern="###0.00;-###0.00"> <textField pattern="###0.00;-###0.00">
<reportElement uuid="40b166b9-7d72-4686-8a07-439fbd452007" x="500" y="0" width="55" height="12"/> <reportElement uuid="40b166b9-7d72-4686-8a07-439fbd452007" x="746" y="0" width="55" height="12"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="9"/> <font size="9"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{distanciaKm}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{distanciaKm}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="57fc4cf8-8a8e-4112-b017-c5a1fc388b9a" x="13" y="0" width="100" height="12"/> <reportElement uuid="57fc4cf8-8a8e-4112-b017-c5a1fc388b9a" x="259" y="0" width="100" height="12"/>
<textElement> <textElement>
<font size="9"/> <font size="9"/>
<paragraph leftIndent="4"/> <paragraph leftIndent="4"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{corridaId}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{corridaId}]]></textFieldExpression>
</textField> </textField>
<textField>
<reportElement uuid="4089971f-a6c6-43b7-adfb-1d1427a9e570" x="1" y="0" width="59" height="12"/>
<textElement>
<font size="9" isBold="false"/>
</textElement>
<textFieldExpression><![CDATA[$F{tipoEmpleadoTramo}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="cbdbd675-769a-4cac-af77-0f5876f60864" mode="Transparent" x="60" y="0" width="68" height="12" backcolor="#FFFFFF"/>
<textElement>
<font size="9"/>
</textElement>
<textFieldExpression><![CDATA[$F{idEmpleado}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="560ecce1-2a4a-42b2-b2da-ef04ae8b2363" mode="Transparent" x="128" y="0" width="131" height="12" backcolor="#FFFFFF"/>
<textElement>
<font size="9"/>
<paragraph leftIndent="2"/>
</textElement>
<textFieldExpression><![CDATA[$F{nomeEmpleado}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<noData> <noData>