From 27203c94371cd32ac8ddc82e10fc05653edb5532 Mon Sep 17 00:00:00 2001 From: "thiago.clemente" Date: Mon, 10 Feb 2020 00:37:16 +0000 Subject: [PATCH] fixes bug#18060 dev: qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@100109 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDepositosNovo.java | 72 +++++- .../templates/RelatorioDepositosNovo.jasper | Bin 48146 -> 45918 bytes .../templates/RelatorioDepositosNovo.jrxml | 218 ++++++------------ .../utilitarios/RelatorioDepositoBean.java | 11 +- .../RelatorioDepositosController.java | 1 + 5 files changed, 147 insertions(+), 155 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java index 17a835e90..fe808836e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java @@ -6,8 +6,12 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; import org.apache.log4j.Logger; @@ -68,6 +72,7 @@ public class RelatorioDepositosNovo extends Relatorio { deposito.setVrfechamento(rs.getBigDecimal("vrdeposito")); deposito.setCodigoInstFinanceira(rs.getString("codinstfin")); deposito.setNomeInstFinanceira(rs.getString("nomeinstfin")); + deposito.setFechamentocntcorrenteId(rs.getLong("fechamentocntcorrente_id")); if (! filtrarPendentes){ deposito.setNumdeposito(rs.getString("numdeposito")); @@ -75,7 +80,9 @@ public class RelatorioDepositosNovo extends Relatorio { lsDadosRelatorio.add(deposito); } - + + addApenasPendentes(parametros, lsDadosRelatorio); + if (lsDadosRelatorio.size() > 0) { setLsDadosRelatorio(lsDadosRelatorio); } @@ -113,7 +120,8 @@ public class RelatorioDepositosNovo extends Relatorio { } sql.append(" tmp.codinstfin, "); - sql.append(" tmp.nomeinstfin "); + sql.append(" tmp.nomeinstfin, "); + sql.append(" tmp.fechamentocntcorrente_id "); sql.append(" FROM "); sql.append(" ( SELECT DISTINCT e.nombempresa, "); sql.append(" p.nombpuntoventa, "); @@ -185,4 +193,64 @@ public class RelatorioDepositosNovo extends Relatorio { return sql.toString(); } + + private void addApenasPendentes(Map parametros, List lsDadosRelatorio) { + Map mapaValorDeposito = new HashMap(); + Map mapaValorDepositoEmpresa = new HashMap(); + Map mapaValorFechamento = new HashMap(); + Map mapaValorFechamentoEmpresa = new HashMap(); + Iterator iterator = lsDadosRelatorio.iterator(); + + for (RelatorioDepositoBean bean: lsDadosRelatorio) { + if (!mapaValorDeposito.containsKey(bean.getFechamentocntcorrenteId())) { + mapaValorDeposito.put(bean.getFechamentocntcorrenteId(), bean.getVrdeposito()); + } else { + mapaValorDeposito.put(bean.getFechamentocntcorrenteId(), mapaValorDeposito.get(bean.getFechamentocntcorrenteId()).add(bean.getVrdeposito())); + } + + if (!mapaValorDepositoEmpresa.containsKey(bean.getNombempresa())) { + mapaValorDepositoEmpresa.put(bean.getNombempresa(), bean.getVrdeposito()); + } else { + mapaValorDepositoEmpresa.put(bean.getNombempresa(), mapaValorDepositoEmpresa.get(bean.getNombempresa()).add(bean.getVrdeposito())); + } + + if (!mapaValorFechamento.containsKey(bean.getFechamentocntcorrenteId())) { + mapaValorFechamento.put(bean.getFechamentocntcorrenteId(), bean.getVrfechamento()); + } + + if (!mapaValorFechamentoEmpresa.containsKey(bean.getNombempresa())) { + mapaValorFechamentoEmpresa.put(bean.getNombempresa(), bean.getVrfechamento()); + } else { + mapaValorFechamentoEmpresa.put(bean.getNombempresa(), mapaValorFechamentoEmpresa.get(bean.getNombempresa()).add(bean.getVrfechamento())); + } + } + + while (iterator.hasNext()) { + RelatorioDepositoBean bean = iterator.next(); + BigDecimal deposito = mapaValorDeposito.get(bean.getFechamentocntcorrenteId()); + BigDecimal fechamento = mapaValorFechamento.get(bean.getFechamentocntcorrenteId()); + + if (deposito.compareTo(fechamento) >= 0) { + mapaValorDepositoEmpresa.put(bean.getNombempresa(), mapaValorDepositoEmpresa.get(bean.getNombempresa()).subtract(bean.getVrdeposito())); + mapaValorFechamentoEmpresa.put(bean.getNombempresa(), mapaValorFechamentoEmpresa.get(bean.getNombempresa()).subtract(bean.getVrfechamento())); + iterator.remove(); + } + } + + BigDecimal totalDepositoGeral = BigDecimal.ZERO; + BigDecimal totalFechamentoGeral = BigDecimal.ZERO; + + for (String nombempresa: mapaValorDepositoEmpresa.keySet()) { + totalDepositoGeral = totalDepositoGeral.add(mapaValorDepositoEmpresa.get(nombempresa)); + } + + for (String nombempresa: mapaValorFechamentoEmpresa.keySet()) { + totalFechamentoGeral = totalFechamentoGeral.add(mapaValorFechamentoEmpresa.get(nombempresa)); + } + + parametros.put("MAPA_VALOR_DEPOSITO_EMPRESA", mapaValorDepositoEmpresa); + parametros.put("MAPA_VALOR_FECHAMENTO_EMPRESA", mapaValorFechamentoEmpresa); + parametros.put("TOTAL_FECHAMENTO_GERAL", totalFechamentoGeral); + parametros.put("TOTAL_PENDENTE_GERAL", totalFechamentoGeral.subtract(totalDepositoGeral)); + } } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosNovo.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosNovo.jasper index db8e371cf0667b2c9ffd025bac4baa6077c46c16..7e8c9d7bcb64d65df2d0044f7282fc786c21306e 100644 GIT binary patch literal 45918 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

2_Cz&bzjwO!62FEcs`#J(~3}v5RQ&KZt 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosNovo.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosNovo.jrxml index 87cacb362..e18199a37 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosNovo.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosNovo.jrxml @@ -5,15 +5,19 @@ - + - + + + + + @@ -24,6 +28,7 @@ + @@ -65,7 +70,7 @@ - + @@ -76,7 +81,7 @@ - + @@ -89,31 +94,9 @@ - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -124,7 +107,7 @@ - + @@ -135,7 +118,7 @@ - + @@ -145,6 +128,17 @@ + + + + + + + + + + + @@ -153,7 +147,7 @@ - + @@ -169,7 +163,7 @@ - + @@ -183,21 +177,7 @@ - - - - - - - - - - - - - - - + @@ -211,21 +191,7 @@ - - - - - - - - - - - - - - - + @@ -239,7 +205,7 @@ - + @@ -253,7 +219,7 @@ - + @@ -271,7 +237,7 @@ - + @@ -281,30 +247,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + @@ -315,7 +259,7 @@ - + @@ -334,9 +278,9 @@ <band height="56"> <frame> - <reportElement mode="Opaque" x="-10" y="-12" width="595" height="40" backcolor="#006699" uuid="0054fd73-707a-4615-8bae-2c2a29f606b3"/> + <reportElement uuid="0054fd73-707a-4615-8bae-2c2a29f606b3" mode="Opaque" x="-10" y="-12" width="595" height="40" backcolor="#006699"/> <textField> - <reportElement x="10" y="10" width="575" height="24" forecolor="#FFFFFF" uuid="558af18f-0344-4d19-b3c8-3ae165b7c91d"/> + <reportElement uuid="558af18f-0344-4d19-b3c8-3ae165b7c91d" x="10" y="10" width="575" height="24" forecolor="#FFFFFF"/> <textElement textAlignment="Justified" verticalAlignment="Middle" markup="styled"> <font fontName="SansSerif" size="18" isBold="true" isPdfEmbedded="true"/> </textElement> @@ -344,11 +288,12 @@ </textField> </frame> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="52" y="42" width="523" height="14" forecolor="#333333" uuid="5dd823a7-3377-42a1-8e6f-977270e9bd79"/> + <reportElement uuid="5dd823a7-3377-42a1-8e6f-977270e9bd79" stretchType="RelativeToTallestObject" x="52" y="42" width="523" height="14" forecolor="#333333"/> + <textElement/> <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> </textField> <textField> - <reportElement x="52" y="28" width="523" height="14" forecolor="#000000" uuid="0840bea7-0cea-4e77-bb5d-969baeaf8a92"/> + <reportElement uuid="0840bea7-0cea-4e77-bb5d-969baeaf8a92" x="52" y="28" width="523" height="14" forecolor="#000000"/> <textElement> <font size="10" isBold="true"/> <paragraph lineSpacing="Single"/> @@ -356,7 +301,7 @@ <textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="28" width="52" height="14" forecolor="#000000" uuid="8fe00f0a-6663-4f7e-9324-666a3dc60f77"/> + <reportElement uuid="8fe00f0a-6663-4f7e-9324-666a3dc60f77" x="0" y="28" width="52" height="14" forecolor="#000000"/> <textElement> <font size="10" isBold="true"/> <paragraph lineSpacing="Single"/> @@ -364,7 +309,7 @@ <textFieldExpression><![CDATA[$R{header.data}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="42" width="52" height="14" forecolor="#000000" uuid="a448c17f-6960-4fb3-8a96-c964c5baabf1"/> + <reportElement uuid="a448c17f-6960-4fb3-8a96-c964c5baabf1" x="0" y="42" width="52" height="14" forecolor="#000000"/> <textElement> <font size="10" isBold="false"/> <paragraph lineSpacing="Single"/> @@ -382,7 +327,7 @@ <detail> <band height="14"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="194" y="0" width="68" height="14" uuid="82d13b4c-c5af-4dc6-8353-58e0bd810b74"/> + <reportElement uuid="82d13b4c-c5af-4dc6-8353-58e0bd810b74" stretchType="RelativeToTallestObject" x="194" y="0" width="68" height="14"/> <box> <bottomPen lineWidth="0.25" lineColor="#666666"/> </box> @@ -393,7 +338,7 @@ <textFieldExpression><![CDATA[$F{dtmotivo}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="262" y="0" width="68" height="14" uuid="d2a192d3-8b19-4023-84b5-6ab5c749bff9"/> + <reportElement uuid="d2a192d3-8b19-4023-84b5-6ab5c749bff9" stretchType="RelativeToTallestObject" x="262" y="0" width="68" height="14"/> <box> <bottomPen lineWidth="0.25" lineColor="#666666"/> </box> @@ -403,30 +348,8 @@ </textElement> <textFieldExpression><![CDATA[$F{vrdeposito}]]></textFieldExpression> </textField> - <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="330" y="0" width="86" height="14" uuid="a9d99df3-e743-46cf-8454-deb020120916"/> - <box> - <bottomPen lineWidth="0.25" lineColor="#666666"/> - </box> - <textElement textAlignment="Right"> - <font size="8" isBold="false"/> - <paragraph lineSpacing="Single"/> - </textElement> - <textFieldExpression><![CDATA[$F{vrfechamento}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="416" y="0" width="68" height="14" uuid="fef8a9f7-d047-4c20-834e-dabd2d2fe0a8"/> - <box> - <bottomPen lineWidth="0.25" lineColor="#666666"/> - </box> - <textElement textAlignment="Right"> - <font size="8" isBold="false"/> - <paragraph lineSpacing="Single"/> - </textElement> - <textFieldExpression><![CDATA[$F{saldo}]]></textFieldExpression> - </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="484" y="0" width="91" height="14" uuid="8a041e80-b312-4fcc-909b-e38cfd9078ba"/> + <reportElement uuid="8a041e80-b312-4fcc-909b-e38cfd9078ba" stretchType="RelativeToTallestObject" x="330" y="0" width="245" height="14"/> <box> <bottomPen lineWidth="0.25" lineColor="#666666"/> </box> @@ -437,7 +360,7 @@ <textFieldExpression><![CDATA[$F{numdeposito}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="52" y="0" width="142" height="14" uuid="655d7066-585e-45b8-8183-f91f0bc3b129"/> + <reportElement uuid="655d7066-585e-45b8-8183-f91f0bc3b129" stretchType="RelativeToTallestObject" x="52" y="0" width="142" height="14"/> <box> <bottomPen lineWidth="0.25" lineColor="#666666"/> </box> @@ -448,7 +371,7 @@ <textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="52" height="14" uuid="0bc7de29-3141-475b-8c8f-759aa61ec086"/> + <reportElement uuid="0bc7de29-3141-475b-8c8f-759aa61ec086" stretchType="RelativeToTallestObject" x="0" y="0" width="52" height="14"/> <box> <bottomPen lineWidth="0.25" lineColor="#666666"/> </box> @@ -466,7 +389,7 @@ <pageFooter> <band height="19"> <textField> - <reportElement mode="Opaque" x="405" y="6" width="129" height="13" forecolor="#000000" backcolor="#E6E6E6" uuid="459669e8-6ea2-4f48-b249-be45842e3018"/> + <reportElement uuid="459669e8-6ea2-4f48-b249-be45842e3018" mode="Opaque" x="405" y="6" width="129" height="13" forecolor="#000000" backcolor="#E6E6E6"/> <box> <bottomPen lineWidth="0.25" lineColor="#666666"/> </box> @@ -474,7 +397,7 @@ <textFieldExpression><![CDATA[$R{header.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{header.de}]]></textFieldExpression> </textField> <textField pattern="EEEEE dd MMMMM yyyy"> - <reportElement mode="Opaque" x="0" y="6" width="405" height="13" backcolor="#E6E6E6" uuid="cf46c42b-8cb7-451a-b5a1-78d62ea4f398"/> + <reportElement uuid="cf46c42b-8cb7-451a-b5a1-78d62ea4f398" mode="Opaque" x="0" y="6" width="405" height="13" backcolor="#E6E6E6"/> <box> <bottomPen lineWidth="0.25" lineColor="#666666"/> </box> @@ -484,40 +407,19 @@ <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField evaluationTime="Report"> - <reportElement mode="Opaque" x="534" y="6" width="41" height="13" backcolor="#E6E6E6" uuid="277c8da2-694c-4ece-8655-a586f2ec09b5"/> + <reportElement uuid="277c8da2-694c-4ece-8655-a586f2ec09b5" mode="Opaque" x="534" y="6" width="41" height="13" backcolor="#E6E6E6"/> <box> <bottomPen lineWidth="0.25" lineColor="#666666"/> </box> + <textElement/> <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> </band> </pageFooter> <summary> - <band height="14"> - <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="330" y="0" width="86" height="14" backcolor="#E6E6E6" uuid="a0c290ae-af70-4468-929c-0fecaaf21a77"/> - <box> - <bottomPen lineWidth="0.0" lineColor="#666666"/> - </box> - <textElement textAlignment="Right"> - <font size="8" isBold="false"/> - <paragraph lineSpacing="Single"/> - </textElement> - <textFieldExpression><![CDATA[$V{fechamento_total}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="416" y="0" width="68" height="14" backcolor="#E6E6E6" uuid="a3f5ae52-8b9d-40d9-a97b-b48959bc59da"/> - <box> - <bottomPen lineWidth="0.0" lineColor="#666666"/> - </box> - <textElement textAlignment="Right"> - <font size="8" isBold="false"/> - <paragraph lineSpacing="Single"/> - </textElement> - <textFieldExpression><![CDATA[$V{saldo_total}]]></textFieldExpression> - </textField> + <band height="28"> <textField> - <reportElement mode="Opaque" x="0" y="0" width="262" height="14" backcolor="#E6E6E6" uuid="a92ccaaa-172c-45be-b475-7ad01db9d28f"/> + <reportElement uuid="a92ccaaa-172c-45be-b475-7ad01db9d28f" mode="Opaque" x="0" y="0" width="262" height="14" backcolor="#E6E6E6"/> <box> <bottomPen lineWidth="0.0" lineColor="#666666"/> </box> @@ -528,7 +430,7 @@ <textFieldExpression><![CDATA[$R{footer.total}]]></textFieldExpression> </textField> <staticText> - <reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="484" y="0" width="91" height="14" backcolor="#E6E6E6" uuid="7bf3ff2c-c4ad-4ee3-b30a-592a939b21e1"/> + <reportElement uuid="7bf3ff2c-c4ad-4ee3-b30a-592a939b21e1" stretchType="RelativeToTallestObject" mode="Opaque" x="330" y="0" width="245" height="14" backcolor="#E6E6E6"/> <box> <bottomPen lineWidth="0.0" lineColor="#666666"/> </box> @@ -539,7 +441,7 @@ <text><![CDATA[]]></text> </staticText> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="262" y="0" width="68" height="14" backcolor="#E6E6E6" uuid="f7213305-9851-4224-805d-ae2a92cfa701"/> + <reportElement uuid="f7213305-9851-4224-805d-ae2a92cfa701" stretchType="RelativeToTallestObject" mode="Opaque" x="262" y="0" width="68" height="14" backcolor="#E6E6E6"/> <box> <bottomPen lineWidth="0.0" lineColor="#666666"/> </box> @@ -549,12 +451,24 @@ </textElement> <textFieldExpression><![CDATA[$V{deposito_total}]]></textFieldExpression> </textField> + <textField> + <reportElement uuid="89065d08-2004-418a-86bd-999352ee3115" mode="Opaque" x="0" y="15" width="575" height="13" backcolor="#E6E6E6"/> + <box> + <bottomPen lineWidth="0.25" lineColor="#666666"/> + </box> + <textElement verticalAlignment="Middle"> + <font size="8" isBold="true"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA["Total Fechamento Geral: " + new DecimalFormat("#,##0.00").format($P{TOTAL_FECHAMENTO_GERAL}) + " / Total Pendente Geral: " + new DecimalFormat("#,##0.00").format($P{TOTAL_PENDENTE_GERAL})]]></textFieldExpression> + </textField> </band> </summary> <noData> <band height="14"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="14" forecolor="#333333" uuid="f6f193c9-6da4-4334-aeb2-362a6af587cf"/> + <reportElement uuid="f6f193c9-6da4-4334-aeb2-362a6af587cf" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="14" forecolor="#333333"/> + <textElement/> <textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression> </textField> </band> diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java index 6348cab0c..68f3f9eea 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java @@ -15,6 +15,7 @@ public class RelatorioDepositoBean implements Comparable { private String numpuntoventa; private String codigoInstFinanceira; private String nomeInstFinanceira; + private Long fechamentocntcorrenteId; public String getCodigoInstFinanceira() { return codigoInstFinanceira; @@ -80,7 +81,15 @@ public class RelatorioDepositoBean implements Comparable { public void setNumpuntoventa(String numpuntoventa) { this.numpuntoventa = numpuntoventa; } - + + public Long getFechamentocntcorrenteId() { + return fechamentocntcorrenteId; + } + + public void setFechamentocntcorrenteId(Long fechamentocntcorrenteId) { + this.fechamentocntcorrenteId = fechamentocntcorrenteId; + } + @Override public int compareTo(Object o) { if(o == null) { 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 74f35ca0f..3f6ae88d0 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 @@ -45,6 +45,7 @@ public class RelatorioDepositosController extends MyGenericForwardComposer { public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); chkFiltrarPendentes.setChecked(true); + chkClassificarBanco.setDisabled(false); } private void executarRelatorio() throws Exception {