fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'AL-3274' (!286) from AL-3274 into master 

Reviewed-on: adm/VentaBoletosAdm#286
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
master
wallace 2023-10-06 18:55:53 +00:00
parent 34a53f385d aff3944b99
commit 7e07a4b64b
2 changed files with 56 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd "> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>

98
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java
View File

@ -177,59 +177,62 @@ public class RelatorioAproveitamentoFinanceiroTrecho extends Relatorio {
this.dados.add(dataResult); this.dados.add(dataResult);
} }
StringBuilder sql2 = buscarTotalViagem(parametros, paradasIds, entry.getKey() ); // StringBuilder sql2 = buscarTotalViagem(parametros, paradasIds, entry.getKey() );
stmt = new NamedParameterStatement(conexao, sql2.toString()); // stmt = new NamedParameterStatement(conexao, sql2.toString());
stmt.setInt("EMPRESA_ID", Integer.valueOf(parametros.get("EMPRESA_ID").toString())); // stmt.setInt("EMPRESA_ID", Integer.valueOf(parametros.get("EMPRESA_ID").toString()));
stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); // stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime()));
stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); // stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime()));
ResultSet rset3 = stmt.executeQuery(); // ResultSet rset3 = stmt.executeQuery();
List<Map<String, Object>> dadosAux = new ArrayList<Map<String, Object>>(); // List<Map<String, Object>> dadosAux = new ArrayList<Map<String, Object>>();
while (rset3.next()) { // while (rset3.next()) {
//
// Map<String, Object> dataResult = new HashMap<String, Object>();
//
// dataResult.put("SERVICO", rset3.getString("servico"));
//
// Integer viagens =0;
//
// Integer segQtde = rset3.getInt("'2'_QTDE");
// viagens = viagens + segQtde;
//
// Integer terQtde = rset3.getInt("'3'_QTDE");
// viagens = viagens .intValue() + terQtde.intValue();
//
// Integer quaQtde = rset3.getInt("'4'_QTDE");
// viagens = viagens.intValue() + quaQtde.intValue();
//
// Integer quiQtde = rset3.getInt("'5'_QTDE");
// viagens = viagens.intValue() + quiQtde.intValue();
//
// Integer sexQtde = rset3.getInt("'6'_QTDE");
// viagens = viagens.intValue() + sexQtde.intValue();
//
// Integer sabQtde = rset3.getInt("'7'_QTDE");
// viagens = viagens.intValue() + sabQtde.intValue();
//
// Integer domQtde = rset3.getInt("'1'_QTDE");
// viagens = viagens.intValue() + domQtde.intValue();
//
// dataResult.put("VIAGENS", new BigDecimal(viagens));
//
// dadosAux.add(dataResult);
// }
Map<String, Object> dataResult = new HashMap<String, Object>();
dataResult.put("SERVICO", rset3.getString("servico"));
Integer viagens =0;
Integer segQtde = rset3.getInt("'2'_QTDE");
viagens = viagens + segQtde;
Integer terQtde = rset3.getInt("'3'_QTDE");
viagens = viagens .intValue() + terQtde.intValue();
Integer quaQtde = rset3.getInt("'4'_QTDE");
viagens = viagens.intValue() + quaQtde.intValue();
Integer quiQtde = rset3.getInt("'5'_QTDE");
viagens = viagens.intValue() + quiQtde.intValue();
Integer sexQtde = rset3.getInt("'6'_QTDE");
viagens = viagens.intValue() + sexQtde.intValue();
Integer sabQtde = rset3.getInt("'7'_QTDE");
viagens = viagens.intValue() + sabQtde.intValue();
Integer domQtde = rset3.getInt("'1'_QTDE");
viagens = viagens.intValue() + domQtde.intValue();
dataResult.put("VIAGENS", new BigDecimal(viagens));
dadosAux.add(dataResult);
}
for (Map<String, Object> map : dados) { for (Map<String, Object> map : dados) {
for (Map<String, Object> mapAux : dadosAux) { // for (Map<String, Object> mapAux : dadosAux) {
if(map.get("SERVICO").equals(mapAux.get("SERVICO"))) { // if(map.get("SERVICO").equals(mapAux.get("SERVICO"))) {
// map.put("VIAGENS_TOTAL_GERAL", new BigDecimal(recuperarMaiorValorQuantidadeViagem(map.get("SERVICO"), dados)));
// map.put("VIAGENS_TOTAL", map.get("VIAGENS_TOTAL_GERAL"));
// }
// }
map.put("VIAGENS_TOTAL_GERAL", new BigDecimal(recuperarMaiorValorQuantidadeViagem(map.get("SERVICO"), dados))); map.put("VIAGENS_TOTAL_GERAL", new BigDecimal(recuperarMaiorValorQuantidadeViagem(map.get("SERVICO"), dados)));
map.put("VIAGENS_TOTAL", mapAux.get("VIAGENS")); map.put("VIAGENS_TOTAL", map.get("VIAGENS_TOTAL_GERAL"));
}
}
} }
paradasIds = new StringBuilder(); paradasIds = new StringBuilder();
this.resultSet = rset3; // this.resultSet = rset3;
} }
Collections.sort(dados, new Comparator<Map<String, Object>> () { Collections.sort(dados, new Comparator<Map<String, Object>> () {
@ -237,6 +240,11 @@ public class RelatorioAproveitamentoFinanceiroTrecho extends Relatorio {
return ((String) m1.get("NUMLINHA")).compareTo((String) m2.get("NUMLINHA")); return ((String) m1.get("NUMLINHA")).compareTo((String) m2.get("NUMLINHA"));
} }
}); });
Collections.sort(dados, new Comparator<Map<String, Object>> () {
public int compare(Map<String, Object> m1, Map<String, Object> m2) {
return ((String) m1.get("SERVICO")).compareTo((String) m2.get("SERVICO"));
}
});
} }