From b90b47fe4200dce2015e41ba7a7bb4fc76640c8e Mon Sep 17 00:00:00 2001 From: fabio Date: Tue, 15 Dec 2020 21:26:58 +0000 Subject: [PATCH] fixes bug#21212 dev: Wallace qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@104748 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioAproveitamentoFinanceiro.java | 50 ++-- .../RelatorioAproveitamentoFinanceiro.jasper | Bin 126496 -> 127809 bytes .../RelatorioAproveitamentoFinanceiro.jrxml | 230 ++++++++++-------- 3 files changed, 147 insertions(+), 133 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java index 6f3b73ac6..4bfbf053f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java @@ -40,7 +40,7 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio { sql.append(" r.DESCRUTA as linha, "); sql.append(" count( c.caja_id) as passageiros, "); sql.append(" sum( c.PRECIOPAGADO )as valor, "); - sql.append(" to_char( c.FECHORVENTA, 'DY') as dia, "); + sql.append(" to_char( c.FECHORVENTA, 'D') as dia, "); sql.append(" coalesce(count(DISTINCT to_char( c.FECHORVENTA, 'WW')), 0) as qtde, "); sql.append(" r.indsentidoida as sentido, "); sql.append(" da.cantasientos as assentos, "); @@ -74,16 +74,16 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio { sql.append(" and c.MOTIVOCANCELACION_ID is null "); sql.append(" and c.INDSTATUSBOLETO = 'V' "); sql.append(" GROUP by r.DESCRUTA, r.indsentidoida, da.cantasientos, "); - sql.append(" to_char( c.FECHORVENTA, 'DY'), TO_CHAR(co.fechorsalidaoriginal ,'HH24:mi'), "); + sql.append(" to_char( c.FECHORVENTA, 'D'), TO_CHAR(co.fechorsalidaoriginal ,'HH24:mi'), "); sql.append(" c.CORRIDA_ID "); - sql.append(" ORDER by r.DESCRUTA, r.indsentidoida desc, to_char( c.FECHORVENTA, 'DY') "); + sql.append(" ORDER by r.DESCRUTA, r.indsentidoida desc, to_char( c.FECHORVENTA, 'D') "); sql.append(" ) "); sql.append("PIVOT "); sql.append("( "); sql.append(" max(valor) receita_ope, "); sql.append(" count(qtde) qtde, "); sql.append(" max(passageiros) tot "); - sql.append(" for dia in ('SEG', 'TER', 'QUA', 'QUI', 'SEX', 'SAB', 'DOM') "); + sql.append(" for dia in ('1', '2', '3', '4', '5', '6', '7') "); sql.append(") "); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); @@ -111,51 +111,51 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio { BigDecimal totReceita = BigDecimal.ZERO; Integer viagens =0; - BigDecimal segReceitaOpe = limpaNulo(rset.getBigDecimal("'SEG'_RECEITA_OPE")); - Integer segQtde = rset.getInt("'SEG'_QTDE"); - BigDecimal segTot = limpaNulo(rset.getBigDecimal("'SEG'_TOT")); + BigDecimal segReceitaOpe = limpaNulo(rset.getBigDecimal("'2'_RECEITA_OPE")); + Integer segQtde = rset.getInt("'2'_QTDE"); + BigDecimal segTot = limpaNulo(rset.getBigDecimal("'2'_TOT")); totPassageiros = totPassageiros.add(segTot); totReceita = totReceita.add(segReceitaOpe); viagens = viagens + segQtde; - BigDecimal terReceitaOpe = limpaNulo(rset.getBigDecimal("'TER'_RECEITA_OPE")); - Integer terQtde = rset.getInt("'TER'_QTDE"); - BigDecimal terTot = limpaNulo(rset.getBigDecimal("'TER'_TOT")); + BigDecimal terReceitaOpe = limpaNulo(rset.getBigDecimal("'3'_RECEITA_OPE")); + Integer terQtde = rset.getInt("'3'_QTDE"); + BigDecimal terTot = limpaNulo(rset.getBigDecimal("'3'_TOT")); totPassageiros = totPassageiros.add(terTot); totReceita = totReceita.add(terReceitaOpe); viagens = viagens .intValue() + terQtde.intValue(); - BigDecimal quaReceitaOpe = limpaNulo(rset.getBigDecimal("'QUA'_RECEITA_OPE")); - Integer quaQtde = rset.getInt("'QUA'_QTDE"); - BigDecimal quaTot = limpaNulo(rset.getBigDecimal("'QUA'_TOT")); + BigDecimal quaReceitaOpe = limpaNulo(rset.getBigDecimal("'4'_RECEITA_OPE")); + Integer quaQtde = rset.getInt("'4'_QTDE"); + BigDecimal quaTot = limpaNulo(rset.getBigDecimal("'4'_TOT")); totPassageiros = totPassageiros.add(quaTot); totReceita = totReceita.add(quaReceitaOpe); viagens = viagens.intValue() + quaQtde.intValue(); - BigDecimal quiReceitaOpe = limpaNulo(rset.getBigDecimal("'QUI'_RECEITA_OPE")); - Integer quiQtde = rset.getInt("'QUI'_QTDE"); - BigDecimal quiTot = limpaNulo(rset.getBigDecimal("'QUI'_TOT")); + BigDecimal quiReceitaOpe = limpaNulo(rset.getBigDecimal("'5'_RECEITA_OPE")); + Integer quiQtde = rset.getInt("'5'_QTDE"); + BigDecimal quiTot = limpaNulo(rset.getBigDecimal("'5'_TOT")); totPassageiros = totPassageiros.add(quiTot); totReceita = totReceita.add(quiReceitaOpe); viagens = viagens.intValue() + quiQtde.intValue(); - BigDecimal sexReceitaOpe = limpaNulo(rset.getBigDecimal("'SEX'_RECEITA_OPE")); - Integer sexQtde = rset.getInt("'SEX'_QTDE"); - BigDecimal sexTot = limpaNulo(rset.getBigDecimal("'SEX'_TOT")); + BigDecimal sexReceitaOpe = limpaNulo(rset.getBigDecimal("'6'_RECEITA_OPE")); + Integer sexQtde = rset.getInt("'6'_QTDE"); + BigDecimal sexTot = limpaNulo(rset.getBigDecimal("'6'_TOT")); totPassageiros = totPassageiros.add(sexTot); totReceita = totReceita.add(sexReceitaOpe); viagens = viagens.intValue() + sexQtde.intValue(); - BigDecimal sabReceitaOpe = limpaNulo(rset.getBigDecimal("'SAB'_RECEITA_OPE")); - Integer sabQtde = rset.getInt("'SAB'_QTDE"); - BigDecimal sabTot = limpaNulo(rset.getBigDecimal("'SAB'_TOT")); + BigDecimal sabReceitaOpe = limpaNulo(rset.getBigDecimal("'7'_RECEITA_OPE")); + Integer sabQtde = rset.getInt("'7'_QTDE"); + BigDecimal sabTot = limpaNulo(rset.getBigDecimal("'7'_TOT")); totPassageiros = totPassageiros.add(sabTot); totReceita = totReceita.add(sabReceitaOpe); viagens = viagens.intValue() + sabQtde.intValue(); - BigDecimal domReceitaOpe = limpaNulo(rset.getBigDecimal("'DOM'_RECEITA_OPE")); - Integer domQtde = rset.getInt("'DOM'_QTDE"); - BigDecimal domTot = limpaNulo(rset.getBigDecimal("'DOM'_TOT")); + BigDecimal domReceitaOpe = limpaNulo(rset.getBigDecimal("'1'_RECEITA_OPE")); + Integer domQtde = rset.getInt("'1'_QTDE"); + BigDecimal domTot = limpaNulo(rset.getBigDecimal("'1'_TOT")); totPassageiros = totPassageiros.add(domTot); totReceita = totReceita.add(domReceitaOpe); viagens = viagens.intValue() + domQtde.intValue(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAproveitamentoFinanceiro.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAproveitamentoFinanceiro.jasper index dc0c3949c809e5939cf2257cccb28931103a6570..b4d7544970759aee65b8fc24c8f0b34c207a61f8 100644 GIT binary patch delta 19843 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 delta 18951 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 Ws!#mq1Q|-T%s5skP~j%X`+opLlMgun diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAproveitamentoFinanceiro.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAproveitamentoFinanceiro.jrxml index bf4c20627..221a5bad2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAproveitamentoFinanceiro.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAproveitamentoFinanceiro.jrxml @@ -417,11 +417,25 @@ - + 0 ? ($F{TOT_RECEITA}.divide ( + $F{TARIFA}.multiply( + $F{VIAGENS}.multiply( + $F{ASSENTOS} + ) + ) +, 2, BigDecimal.ROUND_HALF_UP ) +.multiply( new BigDecimal("100") )) : new BigDecimal(0)]]> - + 0 ? ($F{TOT_RECEITA}.divide ( + $F{TARIFA}.multiply( + $F{VIAGENS}.multiply( + $F{ASSENTOS} + ) + ) +, 2, BigDecimal.ROUND_HALF_UP ) +.multiply( new BigDecimal("100") )) : new BigDecimal(0)]]> @@ -429,7 +443,7 @@ - + @@ -441,7 +455,7 @@ - + @@ -452,7 +466,7 @@ - + @@ -463,7 +477,7 @@ - + @@ -474,7 +488,7 @@ - + @@ -490,7 +504,7 @@ - + @@ -501,12 +515,12 @@ - + - + @@ -518,7 +532,7 @@ - + @@ -531,7 +545,7 @@ - + @@ -544,7 +558,7 @@ - + @@ -556,7 +570,7 @@ - + @@ -569,7 +583,7 @@ - + @@ -581,7 +595,7 @@ - + @@ -594,7 +608,7 @@ - + @@ -606,7 +620,7 @@ - + @@ -619,7 +633,7 @@ - + @@ -632,7 +646,7 @@ - + @@ -644,7 +658,7 @@ - + @@ -657,7 +671,7 @@ - + @@ -670,7 +684,7 @@ - + @@ -682,7 +696,7 @@ - + @@ -695,7 +709,7 @@ - + @@ -708,7 +722,7 @@ - + @@ -729,7 +743,7 @@ - + @@ -737,7 +751,7 @@ - + @@ -745,7 +759,7 @@ - + @@ -753,7 +767,7 @@ - + @@ -761,7 +775,7 @@ - + @@ -773,7 +787,7 @@ - + @@ -781,7 +795,7 @@ - + @@ -789,7 +803,7 @@ - + @@ -797,7 +811,7 @@ - + @@ -805,14 +819,14 @@ - + - + @@ -820,7 +834,7 @@ - + @@ -835,7 +849,7 @@ - + @@ -846,14 +860,14 @@ - + - + @@ -864,7 +878,7 @@ - + @@ -876,7 +890,7 @@ - + @@ -887,7 +901,7 @@ - + @@ -900,7 +914,7 @@ - + @@ -911,7 +925,7 @@ - + @@ -925,7 +939,7 @@ - + @@ -938,7 +952,7 @@ - + @@ -950,7 +964,7 @@ - + @@ -963,7 +977,7 @@ - + @@ -976,7 +990,7 @@ - + @@ -988,7 +1002,7 @@ - + @@ -1001,7 +1015,7 @@ - + @@ -1014,7 +1028,7 @@ - + @@ -1026,7 +1040,7 @@ - + @@ -1039,7 +1053,7 @@ - + @@ -1052,7 +1066,7 @@ - + @@ -1064,7 +1078,7 @@ - + @@ -1077,7 +1091,7 @@ - + @@ -1090,7 +1104,7 @@ - + @@ -1102,7 +1116,7 @@ - + @@ -1115,7 +1129,7 @@ - + @@ -1128,7 +1142,7 @@ - + @@ -1141,7 +1155,7 @@ - + @@ -1153,7 +1167,7 @@ - + @@ -1166,7 +1180,7 @@ - + @@ -1183,22 +1197,22 @@ - + - + - + - + @@ -1211,7 +1225,7 @@ - + @@ -1224,7 +1238,7 @@ - + @@ -1236,7 +1250,7 @@ - + @@ -1249,7 +1263,7 @@ - + @@ -1261,7 +1275,7 @@ - + @@ -1274,7 +1288,7 @@ - + @@ -1286,7 +1300,7 @@ - + @@ -1299,7 +1313,7 @@ - + @@ -1311,7 +1325,7 @@ - + @@ -1324,7 +1338,7 @@ - + @@ -1336,7 +1350,7 @@ - + @@ -1349,7 +1363,7 @@ - + @@ -1361,7 +1375,7 @@ - + @@ -1374,7 +1388,7 @@ - + @@ -1387,7 +1401,7 @@ - + @@ -1399,7 +1413,7 @@ - + @@ -1411,7 +1425,7 @@ - + @@ -1427,7 +1441,7 @@ - + @@ -1439,7 +1453,7 @@ - + @@ -1452,7 +1466,7 @@ - + @@ -1465,7 +1479,7 @@ - + @@ -1477,7 +1491,7 @@ - + @@ -1489,7 +1503,7 @@ - + @@ -1502,7 +1516,7 @@ - + @@ -1515,7 +1529,7 @@ - + @@ -1528,7 +1542,7 @@ - + @@ -1540,7 +1554,7 @@ - + @@ -1552,7 +1566,7 @@ - + @@ -1565,7 +1579,7 @@ - + @@ -1578,7 +1592,7 @@ - + @@ -1591,7 +1605,7 @@ - + @@ -1603,7 +1617,7 @@ - + @@ -1614,7 +1628,7 @@ - + @@ -1627,7 +1641,7 @@ - + @@ -1640,7 +1654,7 @@ - + @@ -1653,7 +1667,7 @@ - + @@ -1666,7 +1680,7 @@ - + @@ -1683,7 +1697,7 @@ - +