From ddb04eacc75f512a663ccf83758234767c6e7d0a Mon Sep 17 00:00:00 2001 From: frederico Date: Mon, 13 Mar 2017 20:21:04 +0000 Subject: [PATCH] fixed bug #8375 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@66784 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioMovimentosAtraso.java | 81 ++++++++++++++++-- ...RelatorioMovimentosAtraso_pt_BR.properties | 3 +- .../RelatorioMovimentosAtraso.jasper | Bin 34230 -> 34344 bytes .../templates/RelatorioMovimentosAtraso.jrxml | 60 +++++++------ .../RelatorioMovimentosAtrasoController.java | 4 + .../filtroRelatorioMovimentosAtraso.zul | 14 ++- 6 files changed, 122 insertions(+), 40 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java index f5ca11a55..a88ba3f5a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java @@ -9,6 +9,7 @@ import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -45,21 +46,85 @@ public class RelatorioMovimentosAtraso extends Relatorio { public void initDados() throws Exception { Connection conexao = this.relatorio.getConexao(); definirFiltros(this.relatorio.getParametros()); - List lsDadosRelatorio = processarRelatorio(conexao); + + Boolean tipoRelatorio = (Boolean) relatorio.getParametros().get("eTipoConferencia"); + + List lsDadosRelatorio = processarRelatorio(conexao, tipoRelatorio); setLsDadosRelatorio(lsDadosRelatorio); } }); } - private List processarRelatorio(Connection conexao) throws ParseException { + private List processarRelatorio(Connection conexao, Boolean eTipoConferencia) throws ParseException { carregarDiasComMovimentos(conexao); - List lsDadosRelatorio = iniciarDados(conexao); - processarDiasConferidos(conexao, lsDadosRelatorio); + List lsDadosRelatorio = iniciarDados(conexao, eTipoConferencia); + + if (eTipoConferencia) { + processarConfenciasNaoFinalizada(conexao, lsDadosRelatorio); + } else { + processarDiasConferidos(conexao, lsDadosRelatorio); + } + removerMovimentosSemAtraso(lsDadosRelatorio); Collections.sort(lsDadosRelatorio); return lsDadosRelatorio; } - + + private void processarConfenciasNaoFinalizada(Connection conexao, List lsDadosRelatorio) { + ResultSet rset = null; + NamedParameterStatement stmt = null; + try { + StringBuilder sQuery = new StringBuilder(); + sQuery.append("SELECT DISTINCT CO.DATAMOVIMENTO ") + .append("FROM CONFERENCIA CO ") + .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = CO.PUNTOVENTA_ID ") + .append("WHERE CO.ACTIVO = 1 ") + .append("AND CO.DATAMOVIMENTO BETWEEN :dataInicial AND :dataFinal ") + .append("AND CO.INDMALOTERECEBIDO = 1 ") + .append("AND CO.INDCONFERIDO = 0 ") + .append("AND CO.EMPRESA_ID = :empresaId ") + .append("AND CO.PUNTOVENTA_ID = :puntoventaId ") + .append("ORDER BY CO.DATAMOVIMENTO"); + + for(MovimentosAtrasoVO movimento : lsDadosRelatorio){ + + movimento.setDiasEmAtraso(new HashSet()); + + log.info(sQuery.toString()); + + stmt = new NamedParameterStatement(conexao, sQuery.toString()); + stmt.setInt("empresaId", empresaId); + stmt.setInt("puntoventaId", movimento.getPuntoventaId()); + stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime())); + stmt.setDate("dataFinal", new java.sql.Date(dataFinal.getTime())); + + rset = stmt.executeQuery(); + + while (rset.next()) { + Date data = DateUtil.normalizar(rset.getDate("DATAMOVIMENTO")); + Calendar cal = Calendar.getInstance(); + cal.setTime(data); + int day = cal.get(Calendar.DAY_OF_MONTH); + movimento.getDiasEmAtraso().add(day); + } + } + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if(rset != null) { + rset.close(); + } + if(stmt != null) { + stmt.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + private void removerMovimentosSemAtraso(List lsDadosRelatorio) { List lsMovimentosSemAtraso = new ArrayList(); for (MovimentosAtrasoVO movimentosAtraso : lsDadosRelatorio) { @@ -200,7 +265,7 @@ public class RelatorioMovimentosAtraso extends Relatorio { } } - private List iniciarDados(Connection conexao) { + private List iniciarDados(Connection conexao, Boolean eTipoConferencia) { ResultSet rset = null; NamedParameterStatement stmt = null; try { @@ -252,7 +317,7 @@ public class RelatorioMovimentosAtraso extends Relatorio { movimentosAtraso.setUf(rset.getString("UF")); movimentosAtraso.setNumtelefonouno(rset.getString("NUMTELEFONOUNO")); carregarDiasMovimento(movimentosAtraso); - if(!movimentosAtraso.getDiasEmAtraso().isEmpty()) { + if(!movimentosAtraso.getDiasEmAtraso().isEmpty() || eTipoConferencia) { lsMovimentosAtrasoVOs.add(movimentosAtraso); } } @@ -279,6 +344,7 @@ public class RelatorioMovimentosAtraso extends Relatorio { movimentosAtrasoBase.setDiasEmAtraso(new TreeSet()); Set diasCompetencia = DateUtil.carregarDiasCompetencia(movimentosAtrasoBase.getCompetencia(), null); Date dataAtual = DateUtil.normalizar(new Date()); + Integer diasEmTransito = movimentosAtrasoBase.getDiasemtransito() != null ? movimentosAtrasoBase.getDiasemtransito() : 0; diasEmTransito += movimentosAtrasoBase.getIntervalofechamento() != null ? movimentosAtrasoBase.getIntervalofechamento() : 0; for (Integer dia : diasCompetencia) { @@ -293,7 +359,6 @@ public class RelatorioMovimentosAtraso extends Relatorio { } else { movimentosAtrasoBase.getDiasEmAtraso().clear(); } - } public void setLsDadosRelatorio(List lsDadosRelatorio) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_pt_BR.properties index b0e253d32..d3f650a34 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentosAtraso_pt_BR.properties @@ -21,4 +21,5 @@ label.telefone=Telefone label.uf=UF label.subordinante=Subordinante label.periodicidade=Periodicidade -label.diasEmAtraso=Dias Em Atraso \ No newline at end of file +label.diasEmAtraso=Dias Em Atraso +label.diasMaloteEntregue=Dias malote entregue não finalizados \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper index 58b7eda11ae068690c784d7f9ff493598663f6e1..9292064e9e2b5631c05dc2c266eb3510956373e5 100644 GIT binary patch delta 9995 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 dh90Gl)06lV2VBkg7$;y2AbzSRF4na=esX1f3Y delta 9752 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 - - - + + +