From c3db73f21a91749ff8919cd6ea3e95a14ab1ed4c Mon Sep 17 00:00:00 2001 From: "fabricio.oliveira" Date: Tue, 7 May 2019 22:28:05 +0000 Subject: [PATCH] =?UTF-8?q?0014274:=20Chamado=2076960=20-=20Relat=C3=B3rio?= =?UTF-8?q?=20Fechamento=20Conta=20Corrente=20/=20Dep=C3=B3sitos=20com=20e?= =?UTF-8?q?rro=20-=20GLPI=2013017=20fixes=20bug#14274=20dev:Aristides=20qu?= =?UTF-8?q?a:Juliane?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@92971 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDepositos.java | 12 ++++---- .../templates/RelatorioDepositos.jasper | Bin 43460 -> 44161 bytes .../templates/RelatorioDepositos.jrxml | 28 ++++++++++++------ .../utilitarios/RelatorioDepositoBean.java | 5 +--- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index f71d9840e..ddf9bdd4e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java @@ -80,9 +80,9 @@ public class RelatorioDepositos extends Relatorio { Collections.sort(lsDadosRelatorio); if (lsDadosRelatorio.size() > 0) { - if(filtrarPendentes) { - lsDadosRelatorio = removeFechamentosZerados(lsDadosRelatorio); - } +// if(filtrarPendentes) { +// lsDadosRelatorio = removeFechamentosZerados(lsDadosRelatorio); +// } setLsDadosRelatorio(lsDadosRelatorio); } setNomeSubReporte(nomeSubReporte); @@ -163,7 +163,8 @@ public class RelatorioDepositos extends Relatorio { sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , "); sql.append(" f.total AS vrdeposito, "); sql.append(" f.FECHAMENTOCNTCORRENTE_ID, "); - sql.append(" fdp.NUMDEPOSITO as numdeposito, "); +// sql.append(" fdp.NUMDEPOSITO as numdeposito, "); + sql.append(" null as numdeposito, "); sql.append(" ifin.CODIGO as codinstfin, "); sql.append(" ifin.NOME as nomeinstfin "); sql.append(" FROM fechamento_cntcorrente f "); @@ -206,7 +207,8 @@ public class RelatorioDepositos extends Relatorio { sql.append(" f.fecfechamento, "); sql.append(" f.FECHAMENTOCNTCORRENTE_ID, "); sql.append(" f.total, "); - sql.append(" fdp.NUMDEPOSITO, "); +// sql.append(" fdp.NUMDEPOSITO, "); + sql.append(" null, "); sql.append(" ifin.CODIGO, "); sql.append(" ifin.NOME ) tmp "); if (filtrarPendentes){ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper index 4953131984c580ad82d4854afd710695740bc343..4a62f9bb5acef41d77a7cff74dbf397c8870805d 100644 GIT binary patch literal 44161 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
    BQX#q1sfe2OeZL8DZlgC5H`uJ;H8_05nw**PAK) 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 F{{uOPFk%1z literal 43460 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 I?IIulZ^f8#+yDRo diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml index 2b88a2c40..687835403 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml @@ -2,7 +2,7 @@ - + @@ -31,10 +31,10 @@ - + - + @@ -46,6 +46,9 @@ + + + @@ -180,28 +183,36 @@ - + + + - + + + - + + + - + + + @@ -313,7 +324,7 @@ - + @@ -366,7 +377,6 @@ - diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java index 56ac28dad..6348cab0c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java @@ -98,10 +98,7 @@ public class RelatorioDepositoBean implements Comparable { } else if (this.dtmotivo.compareTo(rdb.getDtmotivo()) != 0) { return this.dtmotivo.compareTo(rdb.getDtmotivo()); - } else if (this.numdeposito.compareTo(rdb.getNumdeposito()) != 0) { - return this.numdeposito.compareTo(rdb.getNumdeposito()); - - } + } return 0; }