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

fixes bug#15134 

dev:
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@97133 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.clemente 2019-08-30 20:56:47 +00:00
parent d721e9daa5
commit f5e020e0ec
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoBilhete.java
View File

@ -175,11 +175,13 @@ public class RelatorioMovimentacaoBilhete extends Relatorio {
gratuidadeBean.setNumbpe(rset.getString("num_bpe"));
gratuidadeBean.setChavebpe(rset.getString("chbpe"));
gratuidadeBean.setProtocolobpe(rset.getString("nprot"));
gratuidadeBean.setHoraMD(rset.getTimestamp("feccreacion") != null ? hora.format(rset.getTimestamp("feccreacion")) : "");
gratuidadeBean.setHoraEmissao(rset.getTimestamp("fechorventa") != null ? hora.format(rset.getTimestamp("fechorventa")) : "");
if (indstatusboleto.equalsIgnoreCase("TROCA PASSAGEM")
|| indstatusboleto.equalsIgnoreCase("TRANSFERÊNCIA")
|| indstatusboleto.equalsIgnoreCase("REATIVADO")
|| indstatusboleto.equalsIgnoreCase("TROCA TITULARIDADE")
|| indstatusboleto.equalsIgnoreCase("TROCA DE TITULARIDADE")
|| indstatusboleto.equalsIgnoreCase("TROCA POLTRONA")) {
gratuidadeBean.setSerienovo(rset.getString("serienovo"));
gratuidadeBean.setSubserienovo(rset.getString("subserienovo"));
@ -203,7 +205,7 @@ public class RelatorioMovimentacaoBilhete extends Relatorio {
private boolean addBean(RelatorioMovimentacaoBilheteStatusEnum status, String indstatusboleto) {
if (status != null && !indstatusboleto.equals("")) {
return indstatusboleto.equalsIgnoreCase(status.getDescricao()) || indstatusboleto.equalsIgnoreCase(status.getRelacionado());
return indstatusboleto.equalsIgnoreCase(status.getStatusRelatorio()) || indstatusboleto.equalsIgnoreCase(status.getStatusRelatorioAnterior());
}
return true;

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

Binary file not shown.

12
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jrxml
View File

@ -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="RelatorioMovimentacaoBilhete" pageWidth="1152" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1132" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioMovimentacaoBilhete" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
<property name="ireport.zoom" value="1.696390473489942"/>
<property name="ireport.x" value="177"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="48"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<parameter name="fecInicioViagem" class="java.lang.String">
@ -67,6 +67,8 @@
<field name="subserienovo" class="java.lang.String"/>
<field name="ccfnovo" class="java.lang.String"/>
<field name="bpenovo" class="java.lang.String"/>
<field name="horaMD" class="java.lang.String"/>
<field name="horaEmissao" class="java.lang.String"/>
<variable name="qtde" class="java.lang.Integer" calculation="Count">
<variableExpression><![CDATA[$F{km}]]></variableExpression>
</variable>
@ -636,12 +638,12 @@
</textElement>
<textFieldExpression><![CDATA[$F{feccreacion}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="HH:mm:ss" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" stretchType="RelativeToBandHeight" x="175" y="0" width="25" height="23"/>
<textElement>
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{dataEmissao}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{horaEmissao}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="9c9861ac-780e-4e8b-aab8-9a4f506ce62b" stretchType="RelativeToBandHeight" x="400" y="0" width="25" height="23"/>
@ -671,12 +673,12 @@
</textElement>
<textFieldExpression><![CDATA[$F{descorigen}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="HH:mm:ss" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement uuid="dfd8ec54-db1c-49c7-b293-cd387e04dbb9" stretchType="RelativeToBandHeight" x="125" y="0" width="25" height="23"/>
<textElement>
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{feccreacion}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{horaMD}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement uuid="1c26cd83-b322-4490-bf92-59dd50b178cc" stretchType="RelativeToBandHeight" x="50" y="0" width="25" height="23"/>

18
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java
View File

@ -56,6 +56,8 @@ public class RelatorioGratuidadeBean {
private String subserienovo = "N/A";
private String ccfnovo = "N/A";
private String bpenovo = "N/A";
private String horaMD;
private String horaEmissao;
public String getFecdatviaje() {
return fecdatviaje;
@ -369,4 +371,20 @@ public class RelatorioGratuidadeBean {
public void setBpenovo(String bpenovo) {
this.bpenovo = bpenovo;
}
public String getHoraMD() {
return horaMD;
}
public void setHoraMD(String horaMD) {
this.horaMD = horaMD;
}
public String getHoraEmissao() {
return horaEmissao;
}
public void setHoraEmissao(String horaEmissao) {
this.horaEmissao = horaEmissao;
}
}