From 1c5192f5c646728da02b7f2197483d8c03bcbff2 Mon Sep 17 00:00:00 2001
From: "lucas.taia" <lucas.taia@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 6 May 2019 18:44:55 +0000
Subject: [PATCH] fixes bug#13945

dev:lucas

qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@92890 d1611594-4594-4d17-8e1d-87c2c4800839
---
 ...adroDemonstrativoMovimentoPassageiros.java | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageiros.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageiros.java
index fcfcf9b30..bdc3ed8f5 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageiros.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageiros.java
@@ -4,6 +4,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
@@ -35,6 +36,7 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageiros extends Relatorio
 				ResultSet rset = ps.executeQuery();
 
 				while (rset.next()) {
+					boolean agrupar = false;
 					Map<String, Object> dataResult = new HashMap<String, Object>();
 
 					dataResult.put("origem", rset.getString("origem"));
@@ -42,8 +44,32 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageiros extends Relatorio
 					dataResult.put("km", rset.getFloat("km"));
 					dataResult.put("totalida", rset.getLong("totalida"));
 					dataResult.put("totalvolta", rset.getLong("totalvolta"));
-					
-					this.dados.add(dataResult);
+
+					for (Iterator iterator = dados.iterator(); iterator.hasNext();) {
+
+						Map<String, Object> map = (Map<String, Object>) iterator.next();
+						String origem = map.get("origem").toString();
+						String destino = map.get("destino").toString();
+						Long ida = (Long) map.get("totalida");
+						Long volta = (Long) map.get("totalvolta");
+
+						if (origem.equals(rset.getString("destino")) && destino.equals(rset.getString("origem"))) {
+							agrupar = true;
+							if (ida == 0) {
+								map.put("totalida", rset.getLong("totalida"));
+							}
+							if (volta == 0) {
+								map.put("totalvolta", rset.getLong("totalvolta"));
+							}
+
+						}
+
+					}
+
+					if (!agrupar) {
+						this.dados.add(dataResult);
+					}
+
 				}
 
 				this.resultSet = rset;