fixes bug#0012791
dev: fabricio qua: Ajustes efetuados, conforme evidência em anexo. git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@87359 d1611594-4594-4d17-8e1d-87c2c4800839master
emerson
parent
3839535f4c
commit
7656c4206e
|
|
@ -90,6 +90,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
|
|||
bean.setNumBilhete(rset.getString("numBilhete"));
|
||||
bean.setNomeIdoso(rset.getString("NOMBPASAJERO"));
|
||||
bean.setRG(rset.getString("RG"));
|
||||
bean.setUfOrgaoDoc(rset.getString("uforgaodoc"));
|
||||
bean.setCPF(rset.getString("CPF"));
|
||||
bean.setTel(rset.getString("tel"));
|
||||
bean.setEmail(rset.getString("email"));
|
||||
|
|
@ -146,6 +147,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
|
|||
sql.append("WHEN b.DESCNUMDOC IS NOT NULL ");
|
||||
sql.append("THEN b.DESCNUMDOC ELSE c.NUMIDENTIFICAUNO ");
|
||||
sql.append("END AS RG, ");
|
||||
sql.append("b.descorgaodoc uforgaodoc, ");
|
||||
sql.append("CASE ");
|
||||
sql.append("WHEN b.DESCNUMDOC2 IS NOT NULL ");
|
||||
sql.append("THEN b.DESCNUMDOC2 ELSE c.NUMIDENTIFICADOS ");
|
||||
|
|
@ -197,7 +199,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
|
|||
sql.append(" ori.cveparada, ori.descparada, des.cveparada, B.NUMASIENTO, des.descparada, ");
|
||||
sql.append(" b.FECCORRIDA, C.NUMTELEFONO, c.DESCCORREO, CASE WHEN b.DESCNUMDOC IS NOT NULL THEN b.DESCNUMDOC ELSE c.NUMIDENTIFICAUNO END, ");
|
||||
sql.append(" b.NUMFOLIOSISTEMA, CASE WHEN b.DESCNUMDOC2 IS NOT NULL THEN b.DESCNUMDOC2 ELSE c.NUMIDENTIFICADOS END, b.NOMBPASAJERO, b.NUMIDENTIFICACION, T.PRECIO, b.PRECIOPAGADO, b.descorgaodoc, r.PREFIXO, cd.DESCCALLE || ', ' || cd.NUMEXTERIOR || '-' || cd.DESCIUDAD || '/' || cd.DESESTADO, B.MOTIVOCANCELACION_ID, ");
|
||||
sql.append(" T.IMPORTEOUTROS, T.IMPORTEPEDAGIO, T.IMPORTESEGURO, T.IMPORTETAXAEMBARQUE, T.IMPORTETPP, ");
|
||||
sql.append(" T.IMPORTEOUTROS, T.IMPORTEPEDAGIO, T.IMPORTESEGURO, T.IMPORTETAXAEMBARQUE, T.IMPORTETPP, b.descorgaodoc, ");
|
||||
sql.append(" b.IMPORTECATEGORIA, b.IMPORTEOUTROS, b.IMPORTEPEDAGIO, b.IMPORTESEGURO, b.IMPORTETAXAEMBARQUE, b.IMPORTETPP ");
|
||||
sql.append(" ORDER BY OC.DESCORGAO, O.CODEMPRESAPORORGAO, b.FECHORVIAJE, descorigem, descdestino ");
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ header.periodo.venda=Per
|
|||
detail.tipopassagem=Tipo Passagem
|
||||
detail.empresa=Empresa
|
||||
detail.dataViagem=Data Viagem
|
||||
detail.horaViagem=Horário
|
||||
detail.horaViagem=Horário da Viagem
|
||||
detail.origem=Origem
|
||||
detail.destino=Destino
|
||||
detail.poltrona=Poltrona
|
||||
|
|
@ -27,6 +27,7 @@ detail.linha=Linha
|
|||
detail.numBilhete=N° Bilhete
|
||||
detail.nome=Nome
|
||||
detail.rg=RG
|
||||
detail.ufOrgaoEmissor=UF do órgão emissor
|
||||
detail.cpf=CPF
|
||||
detail.endereco=Endereço
|
||||
detail.telEmail=Tel/E-mail
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ header.tipopassagem=Tipo Passagem\:
|
|||
|
||||
detail.empresa=Empresa
|
||||
detail.dataViagem=Data Viagem
|
||||
detail.horaViagem=Horário
|
||||
detail.horaViagem=Horário da Viagem
|
||||
detail.origem=Origem
|
||||
detail.destino=Destino
|
||||
detail.poltrona=Poltrona
|
||||
|
|
@ -28,6 +28,7 @@ detail.linha=Linha
|
|||
detail.numBilhete=N° Bilhete
|
||||
detail.nome=Nome
|
||||
detail.rg=RG
|
||||
detail.ufOrgaoEmissor=UF do órgão emissor
|
||||
detail.cpf=CPF
|
||||
detail.endereco=Endereço
|
||||
detail.telEmail=Tel/\nE-mail
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
<?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="RelatorioGratuidadeARTESP" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="822" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="3ee05e26-199e-4ad2-a96b-dd421627aceb">
|
||||
<property name="ireport.zoom" value="1.2396694214876045"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.x" value="57"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
|
||||
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
|
||||
|
|
@ -32,6 +32,7 @@
|
|||
<field name="email" class="java.lang.String"/>
|
||||
<field name="desistencia" class="java.lang.Boolean"/>
|
||||
<field name="vlrGratuidade" class="java.math.BigDecimal"/>
|
||||
<field name="ufOrgaoDoc" class="java.lang.String"/>
|
||||
<title>
|
||||
<band height="136">
|
||||
<textField>
|
||||
|
|
@ -179,7 +180,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.dataViagem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement uuid="d36987f3-20aa-4e3d-8bb6-5cacf23aa933" stretchType="RelativeToBandHeight" x="436" y="0" width="98" height="20"/>
|
||||
<reportElement uuid="d36987f3-20aa-4e3d-8bb6-5cacf23aa933" stretchType="RelativeToBandHeight" x="397" y="0" width="98" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.5"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -191,7 +192,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.nome}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement uuid="86f8576e-d934-4f0d-9b87-4a40bef953ab" stretchType="RelativeToBandHeight" x="363" y="0" width="37" height="20"/>
|
||||
<reportElement uuid="86f8576e-d934-4f0d-9b87-4a40bef953ab" stretchType="RelativeToBandHeight" x="324" y="0" width="37" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.5"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -203,7 +204,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement uuid="a1aab05d-496e-4fe5-9c2e-760b7592a7fd" stretchType="RelativeToBandHeight" x="127" y="0" width="103" height="20"/>
|
||||
<reportElement uuid="a1aab05d-496e-4fe5-9c2e-760b7592a7fd" stretchType="RelativeToBandHeight" x="127" y="0" width="82" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.5"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -215,7 +216,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.origem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement uuid="7778d2ac-5f98-4955-9bbf-e474a1f16dad" stretchType="RelativeToBandHeight" x="230" y="0" width="100" height="20"/>
|
||||
<reportElement uuid="7778d2ac-5f98-4955-9bbf-e474a1f16dad" stretchType="RelativeToBandHeight" x="209" y="0" width="82" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.5"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -227,7 +228,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement uuid="3eb6f2e7-2aad-4354-8cff-3938c90800ee" stretchType="RelativeToBandHeight" x="400" y="0" width="36" height="20"/>
|
||||
<reportElement uuid="3eb6f2e7-2aad-4354-8cff-3938c90800ee" stretchType="RelativeToBandHeight" x="361" y="0" width="36" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.5"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -251,7 +252,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.telEmail}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement uuid="8aea1354-22f0-45a4-9382-21623ef9a45d" stretchType="RelativeToBandHeight" x="330" y="0" width="33" height="20"/>
|
||||
<reportElement uuid="8aea1354-22f0-45a4-9382-21623ef9a45d" stretchType="RelativeToBandHeight" x="291" y="0" width="33" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.5"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -275,7 +276,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.endereco}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement uuid="16db37b0-e079-4427-88f8-9b429db26ce3" stretchType="RelativeToBandHeight" x="534" y="0" width="46" height="20"/>
|
||||
<reportElement uuid="16db37b0-e079-4427-88f8-9b429db26ce3" stretchType="RelativeToBandHeight" x="495" y="0" width="46" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.5"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -286,12 +287,24 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.rg}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement uuid="be434e4c-9dbc-435b-8177-f81919d62cd3" stretchType="RelativeToBandHeight" x="541" y="0" width="37" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.5"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
<bottomPen lineWidth="0.5"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle" markup="styled">
|
||||
<font fontName="SansSerif" size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.ufOrgaoEmissor}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</columnHeader>
|
||||
<detail>
|
||||
<band height="20" splitType="Prevent">
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="e91ddf3d-5ee2-42d3-b8d4-01c92a2f462a" stretchType="RelativeToTallestObject" x="127" y="0" width="103" height="20"/>
|
||||
<reportElement uuid="e91ddf3d-5ee2-42d3-b8d4-01c92a2f462a" stretchType="RelativeToTallestObject" x="127" y="0" width="82" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -303,7 +316,7 @@
|
|||
<textFieldExpression><![CDATA[$F{descOrigem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="d9ec1d06-efc7-4a65-96a2-e88e89f4ca91" stretchType="RelativeToTallestObject" x="230" y="0" width="100" height="20"/>
|
||||
<reportElement uuid="d9ec1d06-efc7-4a65-96a2-e88e89f4ca91" stretchType="RelativeToTallestObject" x="209" y="0" width="82" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -351,7 +364,7 @@
|
|||
<textFieldExpression><![CDATA[$F{horaViagem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="bde0e80b-872a-4b26-b882-83efc01c25b7" stretchType="RelativeToTallestObject" x="363" y="0" width="37" height="20"/>
|
||||
<reportElement uuid="bde0e80b-872a-4b26-b882-83efc01c25b7" stretchType="RelativeToTallestObject" x="324" y="0" width="37" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -363,7 +376,7 @@
|
|||
<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="7e10a3dc-7e63-49cf-ab5a-87bd2e7aa213" stretchType="RelativeToTallestObject" x="330" y="0" width="33" height="20"/>
|
||||
<reportElement uuid="7e10a3dc-7e63-49cf-ab5a-87bd2e7aa213" stretchType="RelativeToTallestObject" x="291" y="0" width="33" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -375,7 +388,7 @@
|
|||
<textFieldExpression><![CDATA[$F{poltrona}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="0803ee7f-f5d1-4cfb-8fe5-a6109922ab26" stretchType="RelativeToTallestObject" x="436" y="0" width="98" height="20"/>
|
||||
<reportElement uuid="0803ee7f-f5d1-4cfb-8fe5-a6109922ab26" stretchType="RelativeToTallestObject" x="397" y="0" width="98" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -387,7 +400,7 @@
|
|||
<textFieldExpression><![CDATA[$F{nomeIdoso}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="0aeeb871-0a94-4ce7-97b6-892a7d138ed0" stretchType="RelativeToTallestObject" x="534" y="0" width="46" height="20"/>
|
||||
<reportElement uuid="0aeeb871-0a94-4ce7-97b6-892a7d138ed0" stretchType="RelativeToTallestObject" x="495" y="0" width="46" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -448,7 +461,7 @@
|
|||
<textFieldExpression><![CDATA[$F{vlrGratuidade}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="e4dc6a7f-049d-45e1-9c6d-231303fb288c" stretchType="RelativeToTallestObject" x="400" y="0" width="36" height="20"/>
|
||||
<reportElement uuid="e4dc6a7f-049d-45e1-9c6d-231303fb288c" stretchType="RelativeToTallestObject" x="361" y="0" width="36" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
|
|
@ -474,6 +487,18 @@
|
|||
|| $F{tel}.equalsIgnoreCase("null"))
|
||||
? $F{email} : $F{tel}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="02c27999-1a75-4530-bb30-75c2fb08e297" stretchType="RelativeToTallestObject" x="541" y="0" width="37" height="20"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.0"/>
|
||||
<leftPen lineWidth="0.5"/>
|
||||
<bottomPen lineWidth="0.5"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle" markup="styled">
|
||||
<font fontName="SansSerif" size="7"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{ufOrgaoDoc}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</detail>
|
||||
<noData>
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ public class RelatorioGratuidadeARTESPBean {
|
|||
private String numBilhete;
|
||||
private String nomeIdoso;
|
||||
private String RG;
|
||||
private String ufOrgaoDoc;
|
||||
private String CPF;
|
||||
private String endereco;
|
||||
private String tel;
|
||||
|
|
@ -121,6 +122,14 @@ public class RelatorioGratuidadeARTESPBean {
|
|||
RG = rG;
|
||||
}
|
||||
|
||||
public String getUfOrgaoDoc() {
|
||||
return ufOrgaoDoc;
|
||||
}
|
||||
|
||||
public void setUfOrgaoDoc(String ufOrgaoDoc) {
|
||||
this.ufOrgaoDoc = ufOrgaoDoc;
|
||||
}
|
||||
|
||||
public String getCPF() {
|
||||
return CPF;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue