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

fixes bug #6592 

fixes bug #6602

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@48409 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-09-29 20:21:40 +00:00
parent dd56cfeb45
commit 455df6c93f
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext;
public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
private static final Integer CEM = Integer.valueOf(100);
private static final Integer MAX_DECIMAL = Integer.valueOf(5);
private static final Integer MAX_DECIMAL = Integer.valueOf(3);
private static final Integer MIN_DECIMAL = Integer.valueOf(2);
private static String CONSTANTE_GRATUIDADE_CRIANCA;

15
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
View File

@ -424,24 +424,24 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(" WHERE RS.ACTIVO = 1 ");
sql.append(" AND T.ACTIVO = 1 ");
sql.append(" GROUP BY RS.RUTA_ID) TB1, ");
sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, ");
sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, ");
sql.append(" COUNT(CASE WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL AND C.TIPOSERVICIO_ID = 1 THEN 1 ELSE NULL END) AS ORD ");
sql.append(" FROM CORRIDA C ");
sql.append(" WHERE C.ACTIVO <> 0 ");
sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID) TB2, ");
sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, ");
sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) TB2, ");
sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, ");
sql.append(" COUNT(CASE WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL AND C.TIPOSERVICIO_ID = 2 THEN 1 ELSE NULL END) AS EXTRA ");
sql.append(" FROM CORRIDA C ");
sql.append(" WHERE C.ACTIVO <> 0 ");
sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID) TB3, ");
sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, ");
sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) TB3, ");
sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, ");
sql.append(" COUNT( CASE WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL THEN 1 ELSE NULL END) AS ABSOL ");
sql.append(" FROM CORRIDA C ");
sql.append(" LEFT JOIN BOLETO B ON (B.CORRIDA_ID = C.CORRIDA_ID AND B.FECCORRIDA = C.FECCORRIDA ) ");
sql.append(" WHERE C.ACTIVO <> 0 AND B.ACTIVO = 1 ");
sql.append(" AND B.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND B.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA);
sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID) TB4, ");
sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) TB4, ");
sql.append(" CORRIDA C ");
sql.append("INNER JOIN ");
sql.append(" (SELECT CO.FECCORRIDA, ");
@ -492,10 +492,13 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append("WHERE TB1.RUTA_ID = C.RUTA_ID ");
sql.append("AND TB2.CORRIDA_ID = C.CORRIDA_ID ");
sql.append("AND TB2.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID ");
sql.append("AND TB2.HORASALIDA = TO_CHAR(C.FECHORSALIDA, 'HH24:MI') ");
sql.append("AND TB3.CORRIDA_ID = C.CORRIDA_ID ");
sql.append("AND TB3.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID ");
sql.append("AND TB3.HORASALIDA = TO_CHAR(C.FECHORSALIDA, 'HH24:MI') ");
sql.append("AND TB4.CORRIDA_ID = C.CORRIDA_ID ");
sql.append("AND TB4.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID ");
sql.append("AND TB4.HORASALIDA = TO_CHAR(C.FECHORSALIDA, 'HH24:MI') ");
sql.append("AND C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL ");
sql.append(empresa == null ? "" : "AND C.EMPRESACORRIDA_ID = " + empresa.getEmpresaId());

1
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
View File

@ -38,7 +38,6 @@ public class RelatorioOrigemDestino extends Relatorio {
Boolean trechosSemMovimento = (Boolean) getParametros().get("TRECHOS_SEM_MOVIMENTO");
String sql = getSQL(empresaIds, corridasIds, dataDe, dataAte, bilhetesGratuitos, trechosSemMovimento);
System.out.println(sql);
List<PesoOperacional> lsPesoOperacionalRelatorio = getPesoOperacional(corridasIds, dataDe, dataAte, bilhetesGratuitos, empresaIds, trechosSemMovimento);
getParametros().put("lsPesoOperacionalRelatorio", lsPesoOperacionalRelatorio);