From f5e020e0ec9e3381af9e9ceb34e5d657511a697e Mon Sep 17 00:00:00 2001 From: "thiago.clemente" Date: Fri, 30 Aug 2019 20:56:47 +0000 Subject: [PATCH] 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 --- .../impl/RelatorioMovimentacaoBilhete.java | 6 ++++-- .../RelatorioMovimentacaoBilhete.jasper | Bin 73747 -> 73955 bytes .../RelatorioMovimentacaoBilhete.jrxml | 12 +++++++----- .../utilitarios/RelatorioGratuidadeBean.java | 18 ++++++++++++++++++ 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoBilhete.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoBilhete.java index 2cab82de5..e054d9fc2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoBilhete.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoBilhete.java @@ -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; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jasper index 2ab19ccd8a5537e37da5d20fb3f0dc1fdb1c5cd7..a3aa40954450949ff5a03b3586c5975fee47c848 100644 GIT binary patch literal 73955 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 Q3FSr<&L}K0Cxr|Bf6I~Nj{pDw delta 21655 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 - + @@ -67,6 +67,8 @@ + + @@ -636,12 +638,12 @@ - + - + @@ -671,12 +673,12 @@ - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java index 5d231edc8..d53041eaf 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java @@ -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; + } } \ No newline at end of file