From 849673fca14ca4cc368b39b3b89b443f361fdfd9 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 15 Oct 2013 20:25:22 +0000 Subject: [PATCH] git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@31524 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioLinhaOperacional.java | 14 ++++++-------- .../RelatorioLinhaOperacional.jasper | Bin 36972 -> 36976 bytes .../templates/RelatorioLinhaOperacional.jrxml | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhaOperacional.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhaOperacional.java index 72bd1e75e..959810621 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhaOperacional.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhaOperacional.java @@ -88,9 +88,7 @@ public class RelatorioLinhaOperacional extends Relatorio { sql.append(" TO_CHAR(fechorventa, 'yyyy') fechorventa "); } sql.append(" FROM boleto "); - sql.append(" WHERE fechorventa BETWEEN To_date('").append(dataDe).append("', 'dd/mm/yyyy HH24:mi:ss') "); - sql.append(" AND To_date('").append(dataAte).append("', 'dd/mm/yyyy HH24:mi:ss') "); - sql.append(" AND empresacorrida_id IN (").append(empresaId).append(") "); + sql.append(" WHERE empresacorrida_id IN (").append(empresaId).append(") "); sql.append(" AND INDSTATUSBOLETO <> 'C' "); sql.append(" )ca "); sql.append(" INNER JOIN corrida c ON (c.corrida_id = ca.corrida_id AND c.feccorrida = ca.feccorrida) "); @@ -111,10 +109,7 @@ public class RelatorioLinhaOperacional extends Relatorio { } else if (agruparPorAno) { sql.append(" TO_CHAR(FECHORVTA, 'yyyy') fechorventa "); } - sql.append(" FROM caja_diversos "); - sql.append(" WHERE FECHORVTA BETWEEN To_date('").append(dataDe).append("', 'dd/mm/yyyy HH24:mi:ss') "); - sql.append(" AND To_date('").append(dataAte).append("', 'dd/mm/yyyy HH24:mi:ss') "); - sql.append(" )ca "); + sql.append(" FROM caja_diversos)ca "); sql.append(" INNER JOIN evento_extra ex ON ex.eventoextra_id = ca.eventoextra_id "); sql.append(" INNER JOIN corrida c ON ( c.corrida_id = ex.corrida_id AND c.feccorrida = ex.feccorrida ) "); sql.append(" INNER JOIN empresa e ON e.empresa_id = c.empresacorrida_id "); @@ -132,9 +127,12 @@ public class RelatorioLinhaOperacional extends Relatorio { if (desconsiderarBilhetesDevolvidos) { sql.append(" AND ca.MOTIVOCANCELACION_ID IS NULL "); } + + sql.append(" AND c.feccorrida BETWEEN To_date('").append(dataDe).append("', 'dd/mm/yyyy HH24:mi:ss') "); + sql.append(" AND To_date('").append(dataAte).append("', 'dd/mm/yyyy HH24:mi:ss') "); sql.append("GROUP BY ca.fechorventa, c.corrida_id, c.feccorrida, r.NUMRUTA, r.PREFIXO, c.fechorsalida, r.descruta, o.descparada, d.descparada, e.empresa_id, e.nombempresa "); - sql.append("ORDER BY ca.fechorventa, e.nombempresa ASC "); + sql.append("ORDER BY c.feccorrida, e.nombempresa ASC "); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhaOperacional.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhaOperacional.jasper index cea07aa4d98940b5014f00cf61fa1e4eb58a5f11..572c6080a9f742c2098e405e63b689a0d8f1eba3 100644 GIT binary patch delta 1371 zcmcJP%WD%+6o>CgqDey^nzU5fEFx9&swNYgM-y#qjm1TSEs076EdvcPnnz8iqEXu7 zB1nj$+?@#4jqOGdMy5hRf)!l|;zm#xJ{Ic22mT43$xNn66zZaGLcZTQ=N|6IO};Ov zel4gTyl#Rv3SAERs#(Kt(yLswOJ)*Uu+sMzyPb9*n`2pyO__Dj3#7w3 z(%2ca9cw0j*rNvrIH@%s(z#);2z@l0-@$mnCxRbHYh`kVOQxJ*mWyj4pobs{0@07g zbF25Wli2_+*-xM5y%skd5T^!#sLd><2Z88DSMMg08IcYF(U>RWW*y&uiP5(e1?VY* zC9()7?GH(j-n?do%!zKx)hh z5GsRBfFUD<@e^l9m8ddHzG8Ml$|8&8Ez)U)UWkW9jW8^oR;sKu;aVdcmQGuXq| z8>!K#&=G8$tGso2JWJqX$QeR-q7bVM7=Dqw^}ZLL)?C zi3HzU^kDR06qRt}`XGcP)I$Uj^w3N65@GaEZ{btt-uvy&&9@+Yx!m75-#OzwEcYU~)c_{x z$(1+OMxWQ?@ddhgpVvDa@OK9MevSZ;cKSPOr%zLV=<9R~eUv^dZKmIH&_v&-n~Y}i ziawugkiJcB8m%?ggek$55;7yMi()RB8R6g<-MW6r)e2;9EGr5rn;D!y>RJaXPxd%2 zR}nw7TfhOwX(%5wyMb4rgWk;_;XUA0pbJQ~S~)2uQ?8I8COGh0AV7M6SfYvC#-PCCe>5dF^Zt=h++@8dc^LjRnG_R8%si2b5 z)roXV&o!6js!Jq&oPTUk^bVBiWyJI{+MzeHJ9=?!rCt^)(~Gy>rdQjcsFzVu?{uL| zFUvB$jF?`eZF*Ub>18>lS0U+3LDTy$U+;z8(Tig%^|DZzUfgJ#UTwdkUPeW||L^Pl Vu^5E9oxe - + - +