From b5ef039428dc9b39654e743e7012f16e0126a6cb Mon Sep 17 00:00:00 2001 From: "fabricio.oliveira" Date: Mon, 15 Apr 2019 19:05:19 +0000 Subject: [PATCH] =?UTF-8?q?0014053:=20Comporte=20-=20Chamado=2076675=20-?= =?UTF-8?q?=20Erro=20no=20relat=C3=B3rio=20Fechamento=20de=20Conta=20Corre?= =?UTF-8?q?nte=20/Dep=C3=B3sito=20fixes=20bug#14053=20dev:Fabio=20qua:Rena?= =?UTF-8?q?to?= 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@92002 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDepositos.java | 10 ++++ .../templates/RelatorioDepositos.jasper | Bin 41410 -> 42766 bytes .../templates/RelatorioDepositos.jrxml | 46 ++++++++++-------- .../utilitarios/RelatorioDepositoBean.java | 28 ++++++++++- 4 files changed, 63 insertions(+), 21 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index 44bea9b9c..936960fa9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java @@ -6,6 +6,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -17,6 +18,7 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioDepositoBe import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; +@SuppressWarnings("unchecked") public class RelatorioDepositos extends Relatorio { private static Logger log = Logger.getLogger(RelatorioDepositos.class); @@ -75,6 +77,7 @@ public class RelatorioDepositos extends Relatorio { lsDadosRelatorio.add(deposito); } + Collections.sort(lsDadosRelatorio); if (lsDadosRelatorio.size() > 0) { setLsDadosRelatorio(lsDadosRelatorio); } @@ -142,6 +145,13 @@ public class RelatorioDepositos extends Relatorio { sql.append(" ON ifin.INSTIFINANCEIRA_ID = ecb.INSTIFINANCEIRA_ID "); sql.append(" WHERE f.fecfechamento BETWEEN ? AND ? "); sql.append(" AND f.activo = 1 "); + sql.append(" AND f.activo = 1 "); + sql.append(" AND e.activo = 1 "); + sql.append(" AND p.activo = 1 "); + sql.append(" AND fd.activo = 1 "); + sql.append(" AND fdp.activo = 1 "); + sql.append(" AND ecb.activo = 1 "); + sql.append(" AND ifin.activo = 1 "); if (puntoVentaId != null){ sql.append(" and f.puntoventa_id = " + puntoVentaId); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper index 9312d1091e5760b2ee6ef4c4a590127f42a64447..0479fa184764f929614316dccce6f80fa9d88185 100644 GIT binary patch literal 42766 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 - + @@ -24,8 +24,8 @@ - - + + @@ -33,12 +33,15 @@ - + + + + @@ -95,7 +98,7 @@ - + @@ -109,7 +112,7 @@ - + @@ -123,7 +126,7 @@ - + @@ -137,7 +140,7 @@ - + @@ -171,27 +174,27 @@ - + - + - + - + - + @@ -204,6 +207,9 @@ + + + @@ -303,7 +309,7 @@ - + @@ -317,7 +323,7 @@ - + @@ -331,7 +337,7 @@ - + @@ -342,10 +348,10 @@ - + - + @@ -359,7 +365,7 @@ - + @@ -416,7 +422,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java index 38bdc3b3c..56ac28dad 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.relatorios.utilitarios; import java.math.BigDecimal; import java.util.Date; -public class RelatorioDepositoBean { +@SuppressWarnings("rawtypes") +public class RelatorioDepositoBean implements Comparable { private String nombpuntoventa; private String nombempresa; private BigDecimal saldo; @@ -79,5 +80,30 @@ public class RelatorioDepositoBean { public void setNumpuntoventa(String numpuntoventa) { this.numpuntoventa = numpuntoventa; } + + @Override + public int compareTo(Object o) { + if(o == null) { + return 0; + } + + RelatorioDepositoBean rdb = (RelatorioDepositoBean) o; + + if (this.nombempresa.compareTo(rdb.getNombempresa()) != 0) { + return this.nombempresa.compareTo(rdb.getNombempresa()); + + } else if (this.nombpuntoventa.compareTo(rdb.getNombpuntoventa()) != 0) { + return this.nombpuntoventa.compareTo(rdb.getNombpuntoventa()); + + } 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; + } }