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

fixed bug #0008931 -Adicionada a query o filtro para o relatório só apresentar os dados ativos 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68612 d1611594-4594-4d17-8e1d-87c2c4800839
master
bruno.neves 2017-05-08 20:36:27 +00:00
parent 6e18636d94
commit f0c7b600df
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioKmProgramada.java
View File

@ -144,13 +144,14 @@ public class RelatorioKmProgramada extends Relatorio {
sql.append(" c.EMPRESACORRIDA_ID AS Empresa,"); sql.append(" c.EMPRESACORRIDA_ID AS Empresa,");
sql.append(" r.DESCRUTA AS DescLinha,"); sql.append(" r.DESCRUTA AS DescLinha,");
sql.append(" c.TIPOSERVICIO_ID,"); sql.append(" c.TIPOSERVICIO_ID,");
sql.append(" (select sum(t.CANTKMREAL) from CORRIDA_TRAMO ct inner join TRAMO t ON ct.TRAMO_ID = t.TRAMO_ID where ct.CORRIDA_ID = c.CORRIDA_ID"); sql.append(" (select sum(t.CANTKMREAL) from CORRIDA_TRAMO ct inner join TRAMO t ON ct.TRAMO_ID = t.TRAMO_ID AND t.ACTIVO = 1 where ct.CORRIDA_ID = c.CORRIDA_ID AND ct.ACTIVO = 1");
sql.append(" AND ct.FECCORRIDA = c.FECCORRIDA ) AS KMPadrao"); sql.append(" AND ct.FECCORRIDA = c.FECCORRIDA ) AS KMPadrao");
sql.append(" FROM CORRIDA c"); sql.append(" FROM CORRIDA c");
sql.append(" JOIN RUTA r"); sql.append(" JOIN RUTA r");
sql.append(" ON c.RUTA_ID = r.RUTA_ID"); sql.append(" ON c.RUTA_ID = r.RUTA_ID and R.ACTIVO=1");
sql.append(" WHERE "); sql.append(" WHERE ");
sql.append(" c.FECCORRIDA BETWEEN :fecInicio and :fecFinal"); sql.append(" c.ACTIVO=1");
sql.append(" and c.FECCORRIDA BETWEEN :fecInicio and :fecFinal");
if (!empresaId.equals("null")) { if (!empresaId.equals("null")) {
sql.append(" and c.EMPRESACORRIDA_ID = :empresaId "); sql.append(" and c.EMPRESACORRIDA_ID = :empresaId ");
} }