From 90cb1fe24bc416ac90bd69f6add1b450d6cbfab7 Mon Sep 17 00:00:00 2001 From: fabio Date: Thu, 10 Oct 2019 15:42:18 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug#14527=20dev:=20Lucas=20Silv=C3=A9ri?= =?UTF-8?q?o=20qua:?= 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@98197 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDepositos.java | 1 + .../impl/RelatorioDepositosNovo.java | 47 ++++++++++++----- .../templates/RelatorioDepositos.pdf | 51 ------------------- .../RelatorioDepositosController.java | 9 ++++ .../relatorios/filtroRelatorioDepositos.zul | 6 +-- 5 files changed, 46 insertions(+), 68 deletions(-) delete mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.pdf diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index a24c09094..9c2e7a1f5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java @@ -54,6 +54,7 @@ public class RelatorioDepositos extends Relatorio { stmt.setTimestamp(2, new java.sql.Timestamp(sdf.parse(fecFinal).getTime())); rs = stmt.executeQuery(); + rs.setFetchSize(500); lsDadosRelatorio = new ArrayList(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java index 3cb8cdefe..e59034f32 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java @@ -52,23 +52,27 @@ public class RelatorioDepositosNovo extends Relatorio { stmt.setTimestamp(2, new java.sql.Timestamp(sdf.parse(fecFinal).getTime())); rs = stmt.executeQuery(); + rs.setFetchSize(500); lsDadosRelatorio = new ArrayList(); while (rs.next()) { RelatorioDepositoBean deposito = new RelatorioDepositoBean(); - deposito.setNombempresa(rs.getString(1)); - deposito.setNombpuntoventa(rs.getString(2)); - deposito.setNumpuntoventa(rs.getString(3)); - deposito.setDtmotivo(rs.getDate(4)); - deposito.setSaldo(rs.getBigDecimal(5).multiply(BigDecimal.valueOf(-1))); - deposito.setVrdeposito(rs.getBigDecimal(6)); - deposito.setVrfechamento(rs.getBigDecimal(7)); - deposito.setNumdeposito(rs.getString(8)); - deposito.setCodigoInstFinanceira(rs.getString(9)); - deposito.setNomeInstFinanceira(rs.getString(10)); + deposito.setNombempresa(rs.getString("nombempresa")); + deposito.setNombpuntoventa(rs.getString("nombpuntoventa")); + deposito.setNumpuntoventa(rs.getString("numpuntoventa")); + deposito.setDtmotivo(rs.getDate("dtmotivo")); + deposito.setSaldo(rs.getBigDecimal("saldo").multiply(BigDecimal.valueOf(-1))); + deposito.setVrdeposito(rs.getBigDecimal("vrfechamento")); + deposito.setVrfechamento(rs.getBigDecimal("vrdeposito")); + deposito.setCodigoInstFinanceira(rs.getString("codinstfin")); + deposito.setNomeInstFinanceira(rs.getString("nomeinstfin")); + if (! filtrarPendentes){ + deposito.setNumdeposito(rs.getString("numdeposito")); + } + lsDadosRelatorio.add(deposito); } @@ -103,7 +107,11 @@ public class RelatorioDepositosNovo extends Relatorio { sql.append(" tmp.saldo, "); sql.append(" tmp.vrfechamento, "); sql.append(" tmp.vrdeposito, "); - sql.append(" tmp.numdeposito, "); + + if (! filtrarPendentes){ + sql.append(" tmp.numdeposito, "); + } + sql.append(" tmp.codinstfin, "); sql.append(" tmp.nomeinstfin "); sql.append(" FROM "); @@ -115,7 +123,11 @@ public class RelatorioDepositosNovo 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, "); + + if (! filtrarPendentes){ + sql.append(" fdp.NUMDEPOSITO as numdeposito, "); + } + sql.append(" ifin.CODIGO as codinstfin, "); sql.append(" NVL(ifin.NOME,'') as nomeinstfin "); sql.append(" FROM fechamento_cntcorrente f "); @@ -129,8 +141,11 @@ public class RelatorioDepositosNovo extends Relatorio { sql.append(" LEFT JOIN FECHAMENTO_DEPOSITO fdp "); sql.append(" ON fdp.FECHAMENTODEPOSITO_ID = fd.FECHAMENTODEPOSITO_ID "); sql.append(" AND fdp.activo = 1 "); + sql.append(" LEFT JOIN FECHAMENTO_PARAMGERAL fp "); + sql.append(" ON e.EMPRESA_ID = fp.EMPRESA_ID "); + sql.append(" AND fp.activo = 1 "); sql.append(" LEFT JOIN empresa_contabancaria ecb "); - sql.append(" ON ecb.EMPRESACONTABANCARIA_ID = fdp.EMPRESACONTABANCARIA_ID "); + sql.append(" ON ifin.CODIGO = fp.BOLETO_BANCO_COD "); sql.append(" AND ecb.activo = 1 "); sql.append(" LEFT JOIN INSTI_FINANCEIRA ifin "); sql.append(" ON ifin.INSTIFINANCEIRA_ID = ecb.INSTIFINANCEIRA_ID "); @@ -152,7 +167,11 @@ public class RelatorioDepositosNovo extends Relatorio { sql.append(" f.fecfechamento, "); sql.append(" f.FECHAMENTOCNTCORRENTE_ID, "); sql.append(" f.total, "); - sql.append(" fdp.NUMDEPOSITO, "); + + if (!filtrarPendentes){ + sql.append(" fdp.NUMDEPOSITO, "); + } + sql.append(" ifin.CODIGO, "); sql.append(" ifin.NOME ) tmp "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.pdf b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.pdf deleted file mode 100644 index c7ffbfe52..000000000 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.pdf +++ /dev/null @@ -1,51 +0,0 @@ -%PDF-1.4 -% -3 0 obj -<>stream -xn0y9Y86GEꉟ@x; -뱼ڭoU7/Fn^ͻFWῦVK ų>^~_@Fgdk [(B )3wȮn:J&ݏ~RaIPg2tWB@½NӌC_;(Z oWP;xs?6jV}ܿmҭM!)M;fO!! ),T0}"H ʛg!e| -G!`t#Gsʛg!e GBGѴty,,֑\XaQh>̑8r*Q*o;rExQQ:JͳXG>paEɝ-@Őͼ"oE9=9=hCjB_d aaUPa$.?S+_8BY3!âJgG+ 1:Ӫ -(~xV0xaFсUW@dK%ų#'U̮0Ɍ)~m=4DVk0sRzN? G*Q9pW_3J"ëQu9|ގþFaI`-t/[_=*+.NA -endstream -endobj -1 0 obj -<>/Parent 4 0 R/Contents 3 0 R/Type/Page/Resources<>/Font<>>>/MediaBox[0 0 595 842]>> -endobj -5 0 obj -[1 0 R/XYZ 0 852 0] -endobj -2 0 obj -<> -endobj -4 0 obj -<> -endobj -6 0 obj -<> -endobj -7 0 obj -<> -endobj -8 0 obj -<>/Pages 4 0 R>> -endobj -9 0 obj -<> -endobj -xref -0 10 -0000000000 65535 f -0000000763 00000 n -0000001032 00000 n -0000000015 00000 n -0000001120 00000 n -0000000997 00000 n -0000001183 00000 n -0000001237 00000 n -0000001269 00000 n -0000001372 00000 n -trailer -<<636b874ee70d10c4927e6e7bb9b3d064>]/Info 9 0 R/Size 10>> -startxref -1539 -%%EOF diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/contacorrente/RelatorioDepositosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/contacorrente/RelatorioDepositosController.java index 450869cbe..a624ed34d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/contacorrente/RelatorioDepositosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/contacorrente/RelatorioDepositosController.java @@ -104,6 +104,15 @@ public class RelatorioDepositosController extends MyGenericForwardComposer { executarRelatorio(); } + public void onCheck$chkFiltrarPendentes(Event event) { + if (chkFiltrarPendentes.isChecked()) { + chkClassificarBanco.setDisabled(false); + } else { + chkClassificarBanco.setChecked(false); + chkClassificarBanco.setDisabled(true); + } + } + public Checkbox getChkClassificarBanco() { return chkClassificarBanco; } diff --git a/web/gui/relatorios/filtroRelatorioDepositos.zul b/web/gui/relatorios/filtroRelatorioDepositos.zul index 05a50c8a2..984048e0f 100644 --- a/web/gui/relatorios/filtroRelatorioDepositos.zul +++ b/web/gui/relatorios/filtroRelatorioDepositos.zul @@ -44,10 +44,10 @@