From 7527691dd6526432ba3e537349e379b7341247e3 Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Thu, 7 Dec 2017 18:55:09 +0000 Subject: [PATCH] fixes bug #10327 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@77061 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioDemandasDetalhadoNovoLayout.java | 25 ++++++---- ...elatorioDemandasDetalhadoNovoLayout.jasper | Bin 36557 -> 36599 bytes ...RelatorioDemandasDetalhadoNovoLayout.jrxml | 46 +++++++++--------- 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java index eebc39855..78f6780c6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java @@ -47,13 +47,13 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append("select "); sql.append(" trunc(co.feccorrida) as data_corrida, "); - sql.append(" trunc(bo.fechorviaje) as data, "); + sql.append(" trunc(co.fechorsalida) as data, "); sql.append(" r.descruta as linha, "); sql.append(" r.numruta as codlinha, "); sql.append(" co.corrida_id as servico, "); sql.append(" case when ((ori.indvisibleinternet is null or ori.indvisibleinternet = 1) "); sql.append(" and (des.indvisibleinternet is null or des.indvisibleinternet = 1)) then 'SIM' else 'NÃO' end as internet, "); - sql.append(" bo.fechorviaje as horario, "); + sql.append(" co.fechorsalida as horario, "); sql.append(" ori.descparada as origem, "); sql.append(" des.descparada as destino, "); sql.append(" cs.descclase as classe, "); @@ -68,8 +68,8 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" join corrida_tramo ct on ct.corrida_id = bo.corrida_id and bo.feccorrida = ct.feccorrida and ct.origen_id = bo.origen_id "); sql.append(" join ruta r on co.ruta_id = r.ruta_id "); sql.append(" left join empresa e on e.empresa_id = bo.empresacorrida_id "); - sql.append(" join parada ori on ori.parada_id = bo.origen_id "); - sql.append(" join parada des on des.parada_id = bo.destino_id "); + sql.append(" join parada ori on ori.parada_id = co.origen_id "); + sql.append(" join parada des on des.parada_id = co.destino_id "); sql.append(" join clase_servicio cs on cs.claseservicio_id = co.claseservicio_id "); sql.append(" join rol_operativo ro on ro.roloperativo_id = co.roloperativo_id "); sql.append(" join diagrama_autobus da on ro.diagramaautobus_id = da.diagramaautobus_id "); @@ -99,7 +99,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" ) "); } - sql.append("group by trunc(co.feccorrida), trunc(bo.fechorviaje), r.descruta, r.numruta, co.corrida_id, "); + sql.append("group by co.feccorrida, co.fechorsalida, r.descruta, r.numruta, co.corrida_id, "); sql.append(" case when ((ori.indvisibleinternet is null or ori.indvisibleinternet = 1) "); sql.append(" and (des.indvisibleinternet is null or des.indvisibleinternet = 1)) then 'SIM' else 'NÃO' end, "); sql.append(" bo.fechorviaje, ori.descparada, des.descparada, cs.descclase, "); @@ -109,8 +109,8 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" ), nao_vendidos as ( "); - sql.append(" SELECT co.FECHORSALIDA AS data_corrida, "); - sql.append(" co.FECHORSALIDA AS data, "); + sql.append(" SELECT TRUNC(co.FECHORSALIDA) AS data_corrida, "); + sql.append(" TRUNC(co.FECHORSALIDA) AS data, "); sql.append(" r.descruta AS linha, "); sql.append(" r.numruta AS codlinha, "); sql.append(" co.corrida_id AS servico, "); @@ -122,7 +122,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append("THEN 'SIM' "); sql.append("ELSE 'NÃO' "); sql.append("END AS internet, "); - sql.append("co.FECCORRIDA AS horario, "); + sql.append("co.FECHORSALIDA AS horario, "); sql.append("ori.descparada AS origem, "); sql.append(" des.descparada AS destino, "); sql.append(" cs.descclase AS classe, "); @@ -156,6 +156,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" WHERE ct.activo = 1 "); sql.append(" and co.activo = 1 "); sql.append(" and co.FECHORSALIDA >= :DATA_INICIAL and co.FECHORSALIDA <= :DATA_FINAL "); + sql.append(" and co.CORRIDA_ID not in (select servico from vendidos ) "); if (parametros.get("HORA_INICIAL") != null && parametros.get("HORA_FINAL") != null) { sql.append(" AND "); @@ -174,8 +175,12 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" ) "); } - sql.append(" )select * from ( "); - sql.append(" select * from vendidos v union select * from nao_vendidos ) order by empresa "); + sql.append(" )select "); + sql.append(" DATA_CORRIDA, DATA, LINHA, CODLINHA, SERVICO, INTERNET, HORARIO, ORIGEM, DESTINO, CLASSE, CAPACIDADE, SUM(OCUPACAO) OCUPACAO, TIPO_SERVICO, PLATAFORMA, EMPRESA, SENTIDO "); + sql.append(" from ( "); + sql.append(" select * from vendidos v union select * from nao_vendidos ) "); + sql.append(" GROUP BY DATA_CORRIDA, DATA, LINHA, CODLINHA, SERVICO, INTERNET, HORARIO, ORIGEM, DESTINO, CLASSE, CAPACIDADE, OCUPACAO, TIPO_SERVICO, PLATAFORMA, EMPRESA, SENTIDO "); + sql.append(" order by empresa "); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jasper index 24558e6a7857e5947da309c7de4e0f601db22109..342dd39f1bcab88336c61493cfe7920ed5a37dbc 100644 GIT binary patch delta 4570 zcmb7{Z){W76~NzhVu!}0N^t%V7o0yhZ38rHEKr?A7jRsq}En<_9kSfGCRBEbzstDsl)lTcGR@#T|Lxno2Qad)-K8#IN**W*# z=QzpBv_#@?&O7Ja^SkH%dCz~iZ28w^%e%u(1*0bHh*nkdP(jSZeMf)^9+_C50aFKackVZPy@Z@%o|2Z3k+ZO`pIEyf z=%38<@75)YwHHb)GV`0~O9@?)OLLFfjuYad$2wfpwa=Bi+%aBU?#*N+Ye3cfp4n;X zH1W}eo*Mf10jmccC4N2Z39CAHWis$++j#sZ@s`=?iI!+;GBKNtPi8XAjqx@;tooGT z>XEjwk-SPIs%l~+qeulyk^`PdL@`T>DB&ShHj=*oLA?VLw&?O;$Rm4<=dA~JR^jtf z*#nPNug7Z)1|H(2uN|mbnHP@?1w2ttpB@gbnKfrsf}yYyS>xiRW!-DiEbddas1nwc zsQFB^sOlBOxrLtFR&th>Z)wUMljkfzcUNgAH)u^?V~3Bmxs0{>L^d_i5{!!u-yj56 zpse2$2`S-NSPALjC~v-xw)%FRiO*&dGvP!gJ(J~+MMeb=jmf&EDRNZRHIcCY8N3yB()T;DykskC6!w`d-Q4_Lp%Um&nX@$=PQ)%_JHHpGTW<(CFp=dxU$jnOn z=ybP>Uh~z!#BceWkol!=#}<)UO~0D1E)kgY3BMbHdi^^g=w-hP^m%_H=vVyRp#Rxl z5Bej21L!XGDbV}Wy~aS5G@h=c=T)1PHTJ?b7yUrRl7Ccjw0mkj=#TerZ{>Y|e5LP! z)a>du+WOQ0tgr!fS81ek{SHX~Wq%zEh4!cYjzeMwm1-oW`ZPVP#6ljQs(IG-y@HjR zh)=!J^5b-RA`#DbUBYGF>V+*DQ#DmqJprR;dcawGgD`(7^Y_8Pg(34)TbKn;|H)0QtMj?mgrAN?q> zSlW=4NGog|OC3EFtR?mIL@-(Rh9tfEH@FX_)3~Y5!(|c~iA0qk-((l*e}Y=aWq8Ur zW5LGDC*p{EL^wY((n+`k$pv{gZPje_x>mUdMkt2mP&UXXzrw@I(kwi!*v2;bMcSZi z&gV8vqi^Uv-Fw4tgepLB~USGtNZT1A{@0N25H)E)FprN%Vn!9XefmksZ{n zaNc9a-G@|`=jh3U8FD@M-9ayL{}i7vF~{02^-0p5C}grw?xm5)NpgmM8jgob;$ zqZdcU8Wuhj42RInX<7IYnE9a=O>hf`8ZaQ~m676F?paTNmi}xo0oO0klX<#z=s^0n zSb>R4Ca~PQ8Q8*%RlVg73cYRQ>Uz3MICtcEi~e=UNiG#Md3kwFldoYM6IV^Rxpy<% zg&C{33mvPP+`~QVr*Snu4R~Q^<6{$vSk%i|bi;L(ZJD|kN~kvcI(hGc+ez;a54b1eXj`5xEt=`#Go70lp8ZK3oR zhZo&nqRPY;N?^9 zf1t|5JrhFiWrSQcAv9uuP^ctTUGgABIQoxtElC@hcY!kELxZA!-T>g_~cJ$N*)u7Ey5(9S~8;%F+f5heS% zvMI{)v7{ZhauE}DM#*hPDO98sDpDE&Mmvk_NZD0LY13y?uOucn=qCHQv?Fu$r;w{OG!f6nlj)hs_y+6Ce%fxThkK7D?Ez$E0zQY~v~ZiT3Kdy}imXOJp4Eq} zu0mFOlYZnxCVuDIop;2cp^;Sn4bs20Xc&t!F~o{;n-vu*78NQKt>r4-95{K&ctI5n z(b%}_$@Mo!FZ5v%dy&C#JUaZf@!|M@eGH2;G0KW_n-v!-78fcM@8;_I;-mOz)gRnw z%4B9HF)P-HmbE)=Y`NGA;(y$}caQI*&0|4(8sV52XK>tRa6&~mq2h8F0r}+^$K@zp zSq}RB#OK6MKbx!t`R!yAX{6;-+d(!@jaGMbKHIv#t@HWL*t1>jZ5?eT5+TxFI&IxS zTV5^6{ch^!cKG^Bo$Jh9fBm+F%;z$T5Ana$xjIs@HaSc0J6!bFlaJA*^JV`9nL~JJ delta 5287 zcmb7|Z%muV9mk)?U`#Pd90*W5U?7Bs{3G!QVQ9@7@9`fV{NTs2AGbggIWE|V8)KZ{ z4zhJP=_ave>mTJ5rQOz4-J(s)G>OPn_G)XSs8UxcZ=!6{-YwI#EmJg=H(RT!V)wf{ z!ySJ70wm7Q-S>BQ-_P&vp69Xu_nzhcdzR(#Uil7M>DgO)t=B7C7bHpgJE^WbGc4EQ zs*FDC*;g9x`=%^EB*NXj!?Jb1Bw6}NbyOCt$K>+z zp;6g-1P6Uis$U$wYq1`{Q(Ym|e-1RrPt~ho!ygU%jnWrKW@NbwojK}m?dr<2zw^?f z^jba-A77Pze)L?eL&+B;tEPrWymPo!4j_lt-UN-d5k2aSsyb^9eZ##Sn(Oqa8uX8C z4EFhBh8ivh<1uKkqIqL6|9Y^Wj2!bvpH~$YjGYyv9WN)po$Q}U7S8s6D|5z|n##;1 zvw6}FderMmJmOWnJ=R)F0!To5}Qw?%R+e+FnlfIv`D5%pW#XU)ilgYb)J2cFQU+AxC|0DW@!0aGp<& z?m|xmn&oBG5!i+6#{*7$JsEJ>0wg7U$YX0q*8@$s^;W=*BmNlZ#Mh4l9S(?q)q0<% zXc@HzJB4oJLFjfa*uh#4k->fwbhaGP60}qGXRjDgvrs^Obv|gQKn%HhNt^)$pNWW8#Gy z>}E<6OU(0X)QEdEb&`+Tg&vMJ*U?CHdZE=;9-txAadcUhU>O>Hcqb;*u&StDjW@k@ zJ*&QCp`1~4D%93alU60*?a)q~ExglP*$g%?AJx~mcqtx>!wE0@!V=E$LCr-+aIz5^ z*r7x$NA$g5Qqi^eSeQmb`D1b$U`{1Qh#p54o!7`lY{Vxn zQNEMG`L%e^r4xDix22U6KH0tiEu@%7D@Jo2t)q$9cjQI%Fs7WP4J6T$DoOVYJSrK6 z7ebW+*pj?_`#ki-+s|4^zLce#OVXhUEX*VC3!UhOVV7S;w~S})uR|j#mcUn$)~Su- zFe;31c@;m0q*eS6!w}JO={a0o>-@TjaegSlI29_5FXi*-`|&A!CuJV%>AW93Lbr`U z`@1k3DXtT%w7waud=DYVydYSmLZ#K~`TQ=LP=p^~B+&_FgnC)a_4N%LtE+_Lm%u@a zn}mbbH^agA5IA^2;GjY!$4wIsgWd_&_smVq;Xx)yMe#+LxLuWOB14uO)Q& zbc_A+rV!BSbWy?xHBeZ-q`m{(ZJr1uWb%xzVuz70NSmT`JZ&SQKok|zoz)K3J2`^PmczHqKz}vy|HYmw_aw;>8U)9+T zzPz`^{%})_yHn}nL0}|Bp9v#XO&EDWVB`gXkqOlq`zqIzd>vtY6>BcrK$-pF9^K6An-DwI`0th9uw9yl1&zp>Ddc2$twGp{P?gb=C7Si7el~I zihv0-RZWeCdOw&n@`lCs*JDeXulyK7Hd~+c$P9pwF7! J=+T?4{|6t - + - + @@ -91,7 +91,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -154,11 +154,11 @@ - + - + @@ -190,63 +190,63 @@ - + - + - + - + - + - + - + - + - + @@ -260,18 +260,18 @@ - + - + - +