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

fixed bug#12595 

dev:Valdir
qua:José

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@86765 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2018-11-06 14:53:12 +00:00
parent b6d7462453
commit cc5b2b71ee
4 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java
View File

@ -91,7 +91,8 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
bean.setNomeIdoso(rset.getString("NOMBPASAJERO"));
bean.setRG(rset.getString("RG"));
bean.setCPF(rset.getString("CPF"));
bean.setTelEmail(rset.getString("telEmail"));
bean.setTel(rset.getString("tel"));
bean.setEmail(rset.getString("email"));
bean.setEndereco(rset.getString("endereco"));
bean.setDesistencia(rset.getBoolean("desistencia"));
bean.setVlrGratuidade(rset.getBigDecimal("vlrGratuidade"));
@ -150,12 +151,10 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
sql.append("THEN b.DESCNUMDOC2 ELSE c.NUMIDENTIFICADOS ");
sql.append("END AS CPF, ");
sql.append("r.PREFIXO AS LINHA, ");
sql.append("cd.DESCCALLE || ' #' || cd.NUMEXTERIOR || '-' || ");
sql.append("cd.DESCCALLE || ', ' || cd.NUMEXTERIOR || '-' || ");
sql.append("cd.DESCIUDAD || '/' || cd.DESESTADO AS ENDERECO, ");
sql.append("CASE ");
sql.append("WHEN c.NUMTELEFONO IS NOT NULL ");
sql.append("THEN c.NUMTELEFONO ELSE c.DESCCORREO ");
sql.append("END AS telEmail, ");
sql.append("c.NUMTELEFONO AS tel,");
sql.append("c.DESCCORREO AS email, ");
sql.append("CASE ");
sql.append("WHEN B.MOTIVOCANCELACION_ID IN (31, 32, 90) ");
sql.append("THEN 1 ELSE 0 ");
@ -196,8 +195,8 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
sql.append(" group by OC.DESCORGAO, O.CODEMPRESAPORORGAO, B.FECHORVIAJE, ca.desccategoria, ");
sql.append(" ori.cveparada, ori.descparada, des.cveparada, B.NUMASIENTO, des.descparada, ");
sql.append(" b.FECCORRIDA, CASE WHEN C.NUMTELEFONO IS NOT NULL THEN c.NUMTELEFONO ELSE c.DESCCORREO END, 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(" 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(" b.IMPORTECATEGORIA, b.IMPORTEOUTROS, b.IMPORTEPEDAGIO, b.IMPORTESEGURO, b.IMPORTETAXAEMBARQUE, b.IMPORTETPP ");
sql.append(" ORDER BY OC.DESCORGAO, O.CODEMPRESAPORORGAO, b.FECHORVIAJE, descorigem, descdestino ");

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

Binary file not shown.

19
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeARTESP.jrxml
View File

@ -1,9 +1,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="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="193"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="title"/>
<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"/>
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
@ -29,7 +28,8 @@
<field name="RG" class="java.lang.String"/>
<field name="CPF" class="java.lang.String"/>
<field name="endereco" class="java.lang.String"/>
<field name="telEmail" class="java.lang.String"/>
<field name="tel" class="java.lang.String"/>
<field name="email" class="java.lang.String"/>
<field name="desistencia" class="java.lang.Boolean"/>
<field name="vlrGratuidade" class="java.math.BigDecimal"/>
<title>
@ -103,8 +103,8 @@
</textField>
</band>
</title>
<pageHeader>
<band height="20" splitType="Stretch">
<columnHeader>
<band height="20">
<textField isStretchWithOverflow="true">
<reportElement uuid="f1fb4c10-0b23-48a3-ab44-ec9423860a3a" stretchType="RelativeToBandHeight" x="89" y="0" width="38" height="20"/>
<box>
@ -287,7 +287,7 @@
<textFieldExpression><![CDATA[$R{detail.rg}]]></textFieldExpression>
</textField>
</band>
</pageHeader>
</columnHeader>
<detail>
<band height="20" splitType="Prevent">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
@ -420,7 +420,7 @@
<textElement textAlignment="Center" verticalAlignment="Middle" markup="styled">
<font fontName="SansSerif" size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{endereco}.equals(" #-/") ? "" : $F{endereco}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{endereco}.equals(", -/") ? "" : $F{endereco}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="b95ba55d-899d-4143-bff4-25bdaa95ae12" stretchType="RelativeToTallestObject" x="730" y="0" width="45" height="20"/>
@ -469,7 +469,10 @@
<textElement textAlignment="Center" verticalAlignment="Middle" markup="styled">
<font fontName="SansSerif" size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{telEmail}]]></textFieldExpression>
<textFieldExpression><![CDATA[($F{tel} == null
|| $F{tel}.replaceAll("-","").replaceAll("_","").isEmpty()
|| $F{tel}.equalsIgnoreCase("null"))
? $F{email} : $F{tel}]]></textFieldExpression>
</textField>
</band>
</detail>

19
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeARTESPBean.java
View File

@ -19,7 +19,8 @@ public class RelatorioGratuidadeARTESPBean {
private String RG;
private String CPF;
private String endereco;
private String telEmail;
private String tel;
private String email;
private Boolean desistencia;
private BigDecimal vlrGratuidade;
@ -136,12 +137,20 @@ public class RelatorioGratuidadeARTESPBean {
this.endereco = endereco;
}
public String getTelEmail() {
return telEmail;
public String getTel() {
return tel;
}
public void setTelEmail(String telEmail) {
this.telEmail = telEmail;
public void setTel(String tel) {
this.tel = tel;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public Boolean getDesistencia() {