From 2d50c88cb0f67415532e8c25241e51e05195bf41 Mon Sep 17 00:00:00 2001 From: "lucas.taia" Date: Fri, 23 Sep 2016 01:32:26 +0000 Subject: [PATCH] fixes bug #8006 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@60598 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDepositos.java | 52 +++-- .../templates/RelatorioDepositos.jasper | Bin 34882 -> 36403 bytes .../templates/RelatorioDepositos.jrxml | 203 ++++++++++-------- .../utilitarios/RelatorioDepositoBean.java | 8 + 4 files changed, 155 insertions(+), 108 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index 314576cd7..4a2edc1cd 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java @@ -64,6 +64,7 @@ public class RelatorioDepositos extends Relatorio { deposito.setSaldo(rs.getBigDecimal(4).multiply(BigDecimal.valueOf(-1))); deposito.setVrdeposito(rs.getBigDecimal(5)); deposito.setVrfechamento(rs.getBigDecimal(6)); + deposito.setNumdeposito(rs.getString(7)); lsDadosRelatorio.add(deposito); } @@ -91,23 +92,39 @@ public class RelatorioDepositos extends Relatorio { StringBuilder sql = new StringBuilder(); - sql.append(" SELECT tmp.* FROM ( "); - sql.append(" SELECT e.nombempresa, "); - sql.append(" p.nombpuntoventa, "); - sql.append(" f.fecfechamento AS dtmotivo, "); - sql.append(" ( sum(NVL(fd.valor_pago,0)) - f.total ) AS saldo, "); - sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , "); - sql.append(" f.total AS vrdeposito "); - sql.append(" FROM fechamento_cntcorrente f "); - sql.append(" INNER JOIN punto_venta p "); - sql.append(" ON p.puntoventa_id = f.puntoventa_id "); - sql.append(" INNER JOIN empresa e "); - sql.append(" ON e.empresa_id = f.empresa_id "); - sql.append(" LEFT JOIN fechamento_cct_deposito fd "); - sql.append(" ON fd.fechamentocntcorrente_id = f.fechamentocntcorrente_id "); - sql.append(" AND fd.activo = 1 "); - sql.append(" WHERE f.fecfechamento BETWEEN ? AND ? "); - sql.append(" AND f.activo = 1 "); + sql.append(" SELECT DISTINCT tmp.nombempresa, "); + sql.append(" tmp.nombpuntoventa, "); + sql.append(" tmp.dtmotivo, "); + sql.append(" tmp.saldo, "); + sql.append(" tmp.vrfechamento, "); + sql.append(" tmp.vrdeposito, "); + sql.append(" COALESCE( "); + sql.append(" (SELECT UNIQUE LISTAGG( fdep.NUMDEPOSITO, ',') WITHIN GROUP ( "); + sql.append(" ORDER BY fdep.NUMDEPOSITO) as NUMDEPOSITO "); + sql.append(" FROM fechamento_cntcorrente fcnt "); + sql.append(" LEFT JOIN Fechamento_deposito fdep "); + sql.append(" ON fcnt.FECHAMENTOCNTCORRENTE_ID = fdep.FECHAMENTOCNTCORRENTE_ID "); + sql.append(" WHERE fcnt.FECHAMENTOCNTCORRENTE_ID = tmp.FECHAMENTOCNTCORRENTE_ID "); + sql.append(" GROUP BY fcnt.FECHAMENTOCNTCORRENTE_ID "); + sql.append(" ), ' ') AS numdeposito "); + sql.append(" FROM "); + sql.append(" ( SELECT DISTINCT e.nombempresa, "); + sql.append(" p.nombpuntoventa, "); + sql.append(" f.fecfechamento AS dtmotivo, "); + sql.append(" ( SUM(NVL(fd.valor_pago,0)) - f.total ) AS saldo, "); + sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , "); + sql.append(" f.total AS vrdeposito, "); + sql.append(" fd.FECHAMENTOCNTCORRENTE_ID "); + sql.append(" FROM fechamento_cntcorrente f "); + sql.append(" INNER JOIN punto_venta p "); + sql.append(" ON p.puntoventa_id = f.puntoventa_id "); + sql.append(" INNER JOIN empresa e "); + sql.append(" ON e.empresa_id = f.empresa_id "); + sql.append(" LEFT JOIN fechamento_cct_deposito fd "); + sql.append(" ON fd.fechamentocntcorrente_id = f.fechamentocntcorrente_id "); + sql.append(" AND fd.activo = 1 "); + sql.append(" WHERE f.fecfechamento BETWEEN ? AND ?"); + sql.append(" AND f.activo = 1 "); if (puntoVentaId != null){ sql.append(" and f.puntoventa_id = " + puntoVentaId); @@ -119,6 +136,7 @@ public class RelatorioDepositos extends Relatorio { sql.append(" GROUP BY e.nombempresa, "); sql.append(" p.nombpuntoventa, "); sql.append(" f.fecfechamento, "); + sql.append(" fd.FECHAMENTOCNTCORRENTE_ID, "); sql.append(" f.total ) tmp "); if (filtrarPendentes){ sql.append(" where "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper index 71c099cd8bea7c8eb143ec5ef4db382e776584b3..caf25a7ec38261f45f5979a3ce512c99b49ab081 100644 GIT binary patch literal 36403 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 literal 34882 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 Rt53&)Wf@G{ZOY9g{@)KbtJ(kn diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml index f284396ea..a4cc2a80e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml @@ -1,7 +1,7 @@ - + - + @@ -17,6 +17,7 @@ + @@ -31,68 +32,78 @@ - + - - + + - + - - + + - + - - + + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - + + + + + + + + + + + @@ -103,146 +114,156 @@ - - + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + + + + + + + + - + - + - + - + + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java index 3343f68cf..0b24b7b13 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java @@ -10,6 +10,7 @@ public class RelatorioDepositoBean { private BigDecimal vrdeposito; private BigDecimal vrfechamento; private Date dtmotivo; + private String numdeposito; public String getNombpuntoventa() { return nombpuntoventa; @@ -46,5 +47,12 @@ public class RelatorioDepositoBean { } public void setVrfechamento(BigDecimal vrfechamento) { this.vrfechamento = vrfechamento; + } + public String getNumdeposito() { + return numdeposito; + } + public void setNumdeposito(String numdeposito) { + this.numdeposito = numdeposito; } + }