From f357ebeb8ca176c344459743911df450be7d77a2 Mon Sep 17 00:00:00 2001 From: wilian Date: Fri, 9 Oct 2020 11:47:58 +0000 Subject: [PATCH] fixes bug#20380 dev:fabio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@103738 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDepositos.java | 44 +++++++++++++----- .../templates/RelatorioDepositos.jasper | Bin 44506 -> 44248 bytes .../templates/RelatorioDepositos.jrxml | 26 +++++------ .../utilitarios/RelatorioDepositoBean.java | 9 ---- 4 files changed, 44 insertions(+), 35 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index 818029b94..7306739cc 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.Date; import java.util.List; import java.util.Map; @@ -14,6 +15,7 @@ import org.apache.log4j.Logger; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioDepositoBean; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; @@ -60,6 +62,8 @@ public class RelatorioDepositos extends Relatorio { Integer empresaIdAux = null; BigDecimal pendente = BigDecimal.ZERO; BigDecimal totalFechamento = BigDecimal.ZERO; + Date dtMotivo = null; + Long fechamentocntcorrenteId = null; while (rs.next()) { RelatorioDepositoBean deposito = new RelatorioDepositoBean(); @@ -73,18 +77,36 @@ public class RelatorioDepositos extends Relatorio { deposito.setEmpresaId(rs.getInt("empresaId")); deposito.setPuntoventaId(rs.getInt("puntoventaId")); - if((puntoventaIdAux == null || !puntoventaIdAux.equals(deposito.getPuntoventaId())) || - (empresaIdAux == null || !empresaIdAux.equals(deposito.getEmpresaId()))) { - - puntoventaIdAux = deposito.getPuntoventaId(); - empresaIdAux = deposito.getEmpresaId(); + boolean isPontoVendaEmpresaDiferente = (puntoventaIdAux == null || !puntoventaIdAux.equals(deposito.getPuntoventaId())) || + (empresaIdAux == null || !empresaIdAux.equals(deposito.getEmpresaId())); + + if(fechamentocntcorrenteId == null) { + fechamentocntcorrenteId = rs.getLong("fechamentocntcorrenteId"); + } if(!isPontoVendaEmpresaDiferente && dtMotivo != null && DateUtil.compareOnlyDate(dtMotivo, deposito.getDtmotivo()) == 0 && !fechamentocntcorrenteId.equals(rs.getLong("fechamentocntcorrenteId"))) { pendente = deposito.getVrfechamento(); totalFechamento = totalFechamento.add(deposito.getVrfechamento()); - - if(!lsDadosRelatorio.isEmpty()) { - lsDadosRelatorio.get(lsDadosRelatorio.size() - 1).setSomarPendente(true); - } + fechamentocntcorrenteId = rs.getLong("fechamentocntcorrenteId"); } + + if(isPontoVendaEmpresaDiferente || (dtMotivo == null || DateUtil.compareOnlyDate(dtMotivo, deposito.getDtmotivo()) != 0)) { + + if(isPontoVendaEmpresaDiferente) { + puntoventaIdAux = deposito.getPuntoventaId(); + empresaIdAux = deposito.getEmpresaId(); + pendente = deposito.getVrfechamento(); + dtMotivo = deposito.getDtmotivo(); + totalFechamento = totalFechamento.add(deposito.getVrfechamento()); + fechamentocntcorrenteId = rs.getLong("fechamentocntcorrenteId"); + } + + if(dtMotivo == null || DateUtil.compareOnlyDate(dtMotivo, deposito.getDtmotivo()) != 0) { + pendente = deposito.getVrfechamento(); + totalFechamento = totalFechamento.add(deposito.getVrfechamento()); + fechamentocntcorrenteId = rs.getLong("fechamentocntcorrenteId"); + } + dtMotivo = deposito.getDtmotivo(); + } + pendente = pendente.subtract(deposito.getVrdeposito()); deposito.setVrpendente(pendente); @@ -92,7 +114,6 @@ public class RelatorioDepositos extends Relatorio { } if (lsDadosRelatorio.size() > 0) { - lsDadosRelatorio.get(lsDadosRelatorio.size() - 1).setSomarPendente(true); setLsDadosRelatorio(lsDadosRelatorio); } parametros.put("totalFechamento", totalFechamento); @@ -124,6 +145,7 @@ public class RelatorioDepositos extends Relatorio { sql.append(" tmp.dtmotivo, "); sql.append(" tmp.saldo, "); sql.append(" tmp.vrfechamento, "); + sql.append(" tmp.fechamentocntcorrenteId, "); if (! filtrarPendentes){ sql.append(" tmp.numdeposito, "); @@ -147,7 +169,7 @@ public class RelatorioDepositos extends Relatorio { sql.append(" fdp.NUMDEPOSITO as numdeposito, "); } - sql.append(" f.FECHAMENTOCNTCORRENTE_ID "); + sql.append(" f.FECHAMENTOCNTCORRENTE_ID as fechamentocntcorrenteId "); sql.append(" FROM fechamento_cntcorrente f "); sql.append(" LEFT JOIN punto_venta p "); sql.append(" ON p.puntoventa_id = f.puntoventa_id "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper index 339c7c202963495085b63f728f26cff7c72eff1f..529ae911d90d67d0cc50361c662af361ba1c9826 100644 GIT binary patch delta 13982 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 RVE_A#k5BCu!=KyTV?=;GjhXgi-44C2t!N}4 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 d - + @@ -29,13 +29,9 @@ - - - - @@ -48,15 +44,15 @@ - - - + + + @@ -124,7 +120,7 @@ - + @@ -138,7 +134,7 @@ - + @@ -198,7 +194,7 @@ - + @@ -207,7 +203,7 @@ - + @@ -344,7 +340,7 @@ - + @@ -358,7 +354,7 @@ - + @@ -445,7 +441,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java index 1cfe9efee..f3d0dda2e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java @@ -17,7 +17,6 @@ public class RelatorioDepositoBean implements Comparable { private String codigoInstFinanceira; private String nomeInstFinanceira; private Long fechamentocntcorrenteId; - private Boolean somarPendente; private Integer puntoventaId; private Integer empresaId; @@ -116,14 +115,6 @@ public class RelatorioDepositoBean implements Comparable { return 0; } - public Boolean getSomarPendente() { - return somarPendente != null ? somarPendente : false; - } - - public void setSomarPendente(Boolean somarPendente) { - this.somarPendente = somarPendente; - } - public BigDecimal getVrpendente() { return vrpendente != null ? vrpendente : BigDecimal.ZERO; }