From 91253d173cf1a87161b345112efc3710c9d1cf02 Mon Sep 17 00:00:00 2001 From: "alexandre.lima" Date: Fri, 9 Mar 2018 17:41:12 +0000 Subject: [PATCH] bug#10381 dev:Daniel qua:Renato git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79725 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioLinhaOperacional.java | 21 ++++++++++++++---- .../RelatorioLinhaOperacional.jasper | Bin 36976 -> 37001 bytes .../templates/RelatorioLinhaOperacional.jrxml | 12 +++++----- 3 files changed, 23 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 959810621..39af36db0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhaOperacional.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhaOperacional.java @@ -57,12 +57,18 @@ public class RelatorioLinhaOperacional extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append(" SELECT "); - sql.append(" ca.fechorventa data_venda, "); sql.append(" c.corrida_id corrida_id, "); + if (agruparPorDia) { + sql.append(" to_char(c.feccorrida,'dd/mm/yyyy') data_corrida_formatada, "); + } else if (agruparPorMes) { + sql.append(" to_char(c.feccorrida,'mm/yyyy') data_corrida_formatada, "); + } else if (agruparPorAno) { + sql.append(" to_char(c.feccorrida,'yyyy') data_corrida_formatada, "); + } sql.append(" c.feccorrida data_corrida, "); sql.append(" r.NUMRUTA codigo, "); sql.append(" r.PREFIXO prefixo, "); - sql.append(" c.fechorsalida hora_saida, "); + sql.append(" to_char(c.fechorsalida, 'hh:MM') hora_saida, "); sql.append(" r.descruta linha, "); sql.append(" o.descparada origem, "); sql.append(" d.descparada destino, "); @@ -131,8 +137,15 @@ public class RelatorioLinhaOperacional extends Relatorio { 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 c.feccorrida, e.nombempresa ASC "); + sql.append("GROUP BY c.corrida_id, c.feccorrida, r.NUMRUTA, r.PREFIXO, to_char(c.fechorsalida, 'hh:MM'), r.descruta, o.descparada, d.descparada, e.empresa_id, e.nombempresa, "); + if (agruparPorDia) { + sql.append(" to_char(c.feccorrida,'dd/mm/yyyy') "); + } else if (agruparPorMes) { + sql.append(" to_char(c.feccorrida,'mm/yyyy') "); + } else if (agruparPorAno) { + sql.append(" to_char(c.feccorrida,'yyyy') "); + } + sql.append("ORDER BY c.feccorrida, r.descruta"); 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 572c6080a9f742c2098e405e63b689a0d8f1eba3..1194fb19dbf74a68a20146bce5093deec76aeb21 100644 GIT binary patch delta 5943 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 b|DR97KThv}wTiE!2>zQ~lUhhezP0v0Doia# delta 5378 zcmd5=ZA_cj6~5PC?C`ok;xqv#A!I-xqycO~AOT_wn2&(LU%)~_nS%|O@!^02gj6K$ zwumj+*n0P?N|#bis?;oNGN)u(yDd{zEmBo2n>1Ccs;rr!Mw>Poby1gfRkw4`y>{&Q z&9D9F{Nw06=bU?==ic+)_r37VWzD^pG?)IchGsHq+R1JjQX|^*c4L~hwY7A7JmT8& z;X0ODz9r%=e}<;}ePQ3gOkl$AW3*=*yJ6m?4IP^z+gWIHUZlN zYWKZK>2db2ns((>2&Y|`A{KUZ{Wcb=?S)Kzy@~y~)~TG~W6&(J%k{=If!X&OWA5cP zqeVnRToD=I(}my{8+nE!%=x16MfOqSE_Sw4G>Q&zg)U*>R>9fx0NdWx8tSy#mFTia2`kn&@$0nG)} zATVl>F4rJj6%8_xq~QW{HLPc~HUoW?wb=^fq8Dws^dj?h78&SIIWL+ON6zt<>|_i{tA;hN|_r#+3m_^g5VBCD}qd5Z_pTt_VeqZa9M zEy7jNA`?kku0tOV!TQ^q`1(Ul)w+xPVIfQGRQ-14_nZ{XO(YcUNo!7D=_j( zm-7l&g;yq$cvm^ELE90W81czvueL_%ceTanKjrjj9w5EINH1MZFI*LRnMk64fXiNU zK#|XUDR|-q<2_KkP80XcOL5;h5Eb{%0U@rqP6ygFXtaX5FYetY5;~E9*K+KoClk!o zZnTIQl66N1KdM`!<+_#BCipH$VOQFt!v4`76}FZOLzAf@Ok`Dri3AFZuZe$Si&@u# zE-^m(#@1xwhW@rA1D>N>9Z^YJ98pP|xFj?=Dw0H2MUqIMr1+WyNivZnDThl+PjLjM z2L!@HBv3^?3E7 zjI3wo@%8L!Z#{(1d->$IycJ;Ab+>^%+}#cKC*4-CA9tI<7W7!a_V$#6UF_Kn_UAp7 zikTANBq<(O$MZe;5Zu;V2|{>~-JUVAncm$rg=Ga#( zJ0rm_&(W>18_5C`QhS)Bc@BEKc89nSIG*q8Eb&6nZFhFLy}U&1MZ!%+^SZ2NbA8Tj zP@d|vwb&n14A-8&^zmy?(Vd|KIn+_`>&F)H2Z;>B6)TN7_f|mp(ZgM( zTyA4mN4KL>jN`V6n;<@Sa>0a%1+&$|RWNY5->6u4k(HZn<}z=|h*d&JbC*r_o3SuE zOkl)1h=tryp8oe{eAj5UX0cZv?v-Fn1Y6|UyT^I3Y`4-iW&`DJ7~1T z*Tg@*vL@-Irx1Qkiu`9_1BIjhyTKe*=2K`kYUuWLC|kG&G$zy_u!;teKn?LV2^wVL z(Ib>%!ne(yBejzF+eccIB2J8^5Qzm=Ar=WFj;~1|mWd?dLcAk>ZE#8wXZahIN=}TX z0*M7yAr=WFj;~1|mWd?d3MAG9CScQ#1_~tor9h+7%IVQGBfY>X^df=u@ihtbGLb~z zj2pf31#G2~XV`<{YC=MBOMsR0)|05@Z6V z#M2i2!lXD+!fV5s_{lCXB=CMTTxIBs`)V`GND1swR^ui%H?m(D;F8ev;~ojDvPU9; z0^@5E1jO(VYvqbdapQn*4p*7l^b>gi( z&}8%420UHe?nb+w{DKk_du`klxp!=q>eA#)3$s-x*Vr9Sx7}lFYtoayQIg);<%VGZ zZF;gwi7qr17z)l!>d8F-O?HpBt+Pu{J_aBM>dAc=HaIyo74-WCf_^>ugc5B>TW2fG z@BmT|1?tJCl%#dJ+gj`nJ^73hgDX-#ca^e+6Hjj3PD$3NZ^l=M z%>I3RQ&|ZN^G=3+V|jY|6eUjsk~(&Keov8w*7H#|N>cKC5N)JH z@4UV|9Gu|DPDyH>Kai)7^qj~~KRL5P^RLlD$1C)!C0EF|5ETLHPe5IO7BII1a<(_< z&Vxp}>nbgW__-Boh8b39 - + @@ -24,8 +24,8 @@ - + @@ -42,13 +42,13 @@ - + - + - + @@ -228,7 +228,7 @@ - +