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

fixes bug #6207 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@43482 d1611594-4594-4d17-8e1d-87c2c4800839
master
leonardo 2015-04-28 18:38:25 +00:00
parent 697c7e5345
commit f3b8708275
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java
View File

@ -261,12 +261,12 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append(" :MAX_DECIMAL ) VALOR "); sql.append(" :MAX_DECIMAL ) VALOR ");
sql.append(" FROM (SELECT ROUND(SUM(EQ), :MAX_DECIMAL) EQUIVALENTE, "); sql.append(" FROM (SELECT ROUND(SUM(EQ), :MAX_DECIMAL) EQUIVALENTE, ");
sql.append(" EL EXTENSAO_LINHA "); sql.append(" EL EXTENSAO_LINHA ");
sql.append(" FROM (SELECT ROUND(( BO.NUMKMVIAJE * COUNT(1) / ( EXTENSAO_LINHA.EL ) "); sql.append(" FROM (SELECT ROUND(( BO.NUMKMVIAJE / ( EXTENSAO_LINHA.EL ) * COUNT(1)");
sql.append(" ), :MAX_DECIMAL ) "); sql.append(" ), :MAX_DECIMAL ) ");
sql.append(" EQ, "); sql.append(" EQ, ");
sql.append(" EXTENSAO_LINHA.EL "); sql.append(" EXTENSAO_LINHA.EL ");
sql.append(" EL "); sql.append(" EL ");
sql.append(" FROM BOLETO BO, "); sql.append(" FROM BOLETO BO, CORRIDA C, ");
sql.append(" (SELECT SUM(TR1.CANTKMREAL) EL "); sql.append(" (SELECT SUM(TR1.CANTKMREAL) EL ");
sql.append(" FROM CORRIDA_TRAMO CT1, "); sql.append(" FROM CORRIDA_TRAMO CT1, ");
sql.append(" TRAMO TR1 "); sql.append(" TRAMO TR1 ");
@ -276,6 +276,9 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append(" AND CT1.ACTIVO = 1 ) EXTENSAO_LINHA "); sql.append(" AND CT1.ACTIVO = 1 ) EXTENSAO_LINHA ");
sql.append(" WHERE BO.CORRIDA_ID = :CORRIDA_ID "); sql.append(" WHERE BO.CORRIDA_ID = :CORRIDA_ID ");
sql.append(" AND BO.FECCORRIDA = :FECCORRIDA "); sql.append(" AND BO.FECCORRIDA = :FECCORRIDA ");
sql.append(" AND C.corrida_id = BO.corrida_id ");
sql.append(" AND C.feccorrida = BO.feccorrida ");
sql.append(" AND C.roloperativo_id = :ROLOPERATIVO_ID ");
sql.append(" AND BO.ACTIVO = 1 "); sql.append(" AND BO.ACTIVO = 1 ");
sql.append(" AND ( BO.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND ( BO.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" OR BO.MOTIVOCANCELACION_ID = 0 ) "); sql.append(" OR BO.MOTIVOCANCELACION_ID = 0 ) ");
@ -409,6 +412,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
stmt.setInt("CAPACIDADE", assentos); stmt.setInt("CAPACIDADE", assentos);
stmt.setInt("CEM", CEM); stmt.setInt("CEM", CEM);
stmt.setInt("MAX_DECIMAL", MAX_DECIMAL); stmt.setInt("MAX_DECIMAL", MAX_DECIMAL);
stmt.setInt("ROLOPERATIVO_ID", rolOperativoId);
} else { } else {
stmt.setInt("ROLOPERATIVO_ID", rolOperativoId); stmt.setInt("ROLOPERATIVO_ID", rolOperativoId);
} }
@ -418,6 +422,21 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
if (resultSet.next()) if (resultSet.next())
retorno = resultSet.getBigDecimal("VALOR"); retorno = resultSet.getBigDecimal("VALOR");
if (corridaId == 2020175 && retorno != null){
System.out.println("--------------------------------------------------------------------------------------------------");
System.out.println("SQL: ");
System.out.println(sql);
System.out.println("");
System.out.println("CORRIDA_ID = "+corridaId);
System.out.println("FECCORRIDA = "+data);
System.out.println("CAPACIDADE = "+assentos);
System.out.println("CEM = "+CEM);
System.out.println("MAX_DECIMAL = "+MAX_DECIMAL);
System.out.println("ROLOPERATIVO_ID = "+rolOperativoId);
System.out.println("retorno = "+retorno);
System.out.println("--------------------------------------------------------------------------------------------------");
}
resultSet.close(); resultSet.close();
stmt.close(); stmt.close();
} catch (Exception e) { } catch (Exception e) {