From c2fba4c11076e132f04e69bac5ebff698721ad29 Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Mon, 18 Dec 2017 23:34:55 +0000 Subject: [PATCH] fixes bug #10327 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@77439 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioDemandasDetalhadoNovoLayout.java | 19 ++++++++++++------ ...elatorioDemandasDetalhadoNovoLayout.jasper | Bin 37281 -> 37292 bytes ...RelatorioDemandasDetalhadoNovoLayout.jrxml | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java index 6a2a9fcf8..cf63e789d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java @@ -60,7 +60,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" da.cantasientos as capacidade, "); sql.append(" count(bo.boleto_id) as ocupacao, "); sql.append(" ts.descservicio as tipo_servico, "); - sql.append(" ct.plataforma as plataforma, "); + sql.append(" ( select et1.plataforma from esquema_tramo et1 inner join esquema_corrida ec1 on ec1.esquemacorrida_id = et1.esquemacorrida_id where et1.activo =1 and ec1.activo =1 and ec1.NUMCORRIDA = co.corrida_id and et1.numsecuencia = 1 and rownum <2 ) AS plataforma, "); sql.append(" e.nombempresa as empresa, "); sql.append(" r.INDSENTIDOIDA AS sentido "); sql.append("from boleto bo "); @@ -76,7 +76,11 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" join tipo_servicio ts on ts.tiposervicio_id = co.tiposervicio_id "); sql.append("where ct.activo = 1 "); sql.append(" and bo.motivocancelacion_id is null and bo.numasiento is not null and bo.indstatusoperacion = 'F' "); - sql.append(" and bo.fechorviaje >= :DATA_INICIAL and bo.fechorviaje <= :DATA_FINAL "); + sql.append(" and co.fechorsalida >= :DATA_INICIAL and co.fechorsalida <= :DATA_FINAL "); + + sql.append(" and co.activo = 1 and bo.activo = 1 and ct.activo = 1 and r.activo = 1 and e.activo = 1 and ori.activo = 1 and "); + sql.append(" des.activo = 1 and cs.activo = 1 and ro.activo = 1 and da.activo = 1 and ts.activo = 1 "); + sql.append((parametros.get("RUTA_ID") != null) ? " and r.ruta_id = :RUTA_ID " : ""); sql.append((parametros.get("EMPRESA_ID") != null) ? " and e.empresa_id = :EMPRESA_ID " : ""); sql.append((parametros.get("PARADA_ID") != null) ? " and bo.origen_id = :PARADA_ID " : ""); @@ -99,12 +103,12 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" ) "); } - sql.append("group by co.feccorrida, co.fechorsalida, r.descruta, r.numruta, co.corrida_id, "); + sql.append("group by co.feccorrida, co.fechorsalida, r.descruta, r.numruta, co.corrida_id, ct.plataforma, "); 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(" ori.descparada, des.descparada, cs.descclase, "); sql.append(" da.cantasientos, ts.descservicio, ct.plataforma, e.nombempresa, r.INDSENTIDOIDA "); - sql.append("order by e.nombempresa, data, linha, servico, origem, destino "); + sql.append("order by data, horario, servico, linha, origem, destino "); sql.append(" ), nao_vendidos as ( "); @@ -158,6 +162,9 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" and co.FECHORSALIDA >= :DATA_INICIAL and co.FECHORSALIDA <= :DATA_FINAL "); sql.append(" and co.CORRIDA_ID not in (select servico from vendidos ) "); + sql.append(" and co.activo = 1 and ct.activo = 1 and r.activo = 1 and e.activo = 1 and ori.activo = 1 and des.activo = 1 and "); + sql.append(" cs.activo = 1 and ro.activo = 1 and da.activo = 1 and ts.activo = 1 "); + if (parametros.get("HORA_INICIAL") != null && parametros.get("HORA_FINAL") != null) { sql.append(" AND "); sql.append(" ( "); @@ -179,8 +186,8 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { 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, servico "); + sql.append(" GROUP BY DATA_CORRIDA, DATA, LINHA, CODLINHA, SERVICO, INTERNET, HORARIO, ORIGEM, DESTINO, CLASSE, CAPACIDADE, TIPO_SERVICO, PLATAFORMA, EMPRESA, SENTIDO "); + sql.append(" order by data, horario, servico, linha, origem, destino "); 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 f4967d28fe698b1e182426e1c970024d5c58281f..3fba3d55c2b5a61fb10a437cd05d7efbf98d6c1a 100644 GIT binary patch delta 4809 zcmb7GYfKbZ6rNcSC}8EGJQmmms%b@wh()Bb=w^3e2X<$comoJ%E~_jGE-=DY4XHN$ zqm9NIysc48)2IopjZNB;rmvWwv}uzjHMU7pW6~xyF-@Bon*Qh`q4eCx;0!yEEI$r+ z@AsW^zwh32XXeT^%Z+Q6_ignhCk}HbxY9V69te6mJffniaV~WrawMXTqTCGo_;l7( zSAAt_P5|at_yp1G9EA*CM#p`nd3ZA2D+QfFL1NRNY`5j&=`<-Qw0QiB$!?FV2%<)Y z8kFqvIc3?im@IpO9fC_EtBvIaxN?T%3I&`lC!1GQ74hz33m-tY8uL?S_PdD3+-yY% zNMU0gSac1>G6O!R;%t_J{sc=NKkSCAo6aW-yCnCb9ia1qsCa^+M@iH#DuP?nf819% zmDTj_3jTGJld*2Fa__3mNRu{eI zU29(?RT2E2aJM8bq~7(~z}l?0as^ot9nP_#I-v;WM4=q)4ht199v7a5@u$K@7(Wy$ zDEEAx4OO)kCM*GG3g_*SH5omv<&gGDYY~)~Xtl0klG2(5ADpJf!pHM_D?Xn2Ry#25 zZFMjXwN=3QXj@syO`gL$l1=tc5Cxau^l7<0+pWb6&m?%WAR17pG}l%Fm7paH7&9HO zACwkk>Y@3i>C9*29A5)n zV%dPc^%wIS(Xamf_BS~0=p&BfIsB~PC*W?&yJW@VS5^G`DjE>Qs_QUIn?ToN3yHX5 zy+;2<3~T^;YQWjzS%S=8#x2W@aU5qskHqRUw$ivHTAP;4LH|e&kW(MC2c&ETA^n*OcpGED8D~-}oMQ4639nz$>#3ZsGPW}8z^s`dRpF|&Y zS<#7(oF~q}W^wbgf6v2AIg&!FJ1$}|BwR2NLs1Is#D(z^7Fq==Va)`zoZA6E7fM|u zYW2wmwG>EHdjb6yit-mUwfq@$uA{Nz9bA@#NfU(>O-3QjzzVnPlMMu%J=d9rV)fGEg?Ldnsk# z?{0V8$HGXsXCjQECc-E{gy}g3VGKwRb`MSN!CUtA9y?r@Kl)a0o5so)T~Yi@wp@vG zSxV3;$^mDPe8a({es7<9A?ElE6G?br;(($i4k&;f*!3KP1IAgkH_AUiSNihNt9x&N z@VYP)zTQkYmh&*73(kjQ4hujjI9TQql@cJulBkpc=vE}ZkyfA_y;3b1-q@)_!$VQZ zfF{L@{Yl~+7$~&h|khRNpNMxXa2@2V&gbL3)IBxIYoqNs^03J_O% zj=>cJmUfkrja?P$U8O4hs%EKaU-FhN?~6Igu_Y2pOe|5<#1aLFB|XPri2=)4D#4Z- z^p?`3k^TeGL3&R3jRxNo#vGflT@tEH>{8UkE(M5P zJ;z{|0n6B}!gkB_b~9ZOHL}0IH_{trt?7#su0%;CqTNbs7NqNs@}3J_Czj=>ZImNDf`Jgq=1 z5|8u^j|@iGX>}h=-q^Ny4j3|RawP3c3k12%Xitva;S zOWu2^-7$iNk-$C@^k4537%>q>(}*xSq#T1V1|$emQAw;Egf+&JZ-z^;nB!$EnS?Qu zy`-p#WD1aG&~pru8L&(*4}>?9B5?4ud*KL?MGksDEsej4h@*;-RqQ&YdKeoMHnwxMCm<|%Rb$;#ZtvvD+= KZ$oFs3;qXJd;dxR delta 4482 zcmbVPZA=tL7~VZTeEN!zqdw3?=ki9hVTGrQcbxBQ@&@MdP7 zXWn_9cV>2%>z6H;E?Yh=ZA=?vjxePY)s0(HbHw;CljadbH#dYwSwFhtDCS@=!z~54 zfFRM~cpMMq?Tfq`sU8|ss^#AP=+JPaKOQGA@YAJ$(8_xgS@K907ax=bQOyF$a|zk$ z;etW_d2)~sbO=t3e7I?u4ak|2Gvwo(oHl;HsbmR^XE`}MEVwwAmIxz-fGm^+pAag;kIM`R(Elx$}d0{_ZMVnE1h*$V$zhm1e5N$OL6ixM^S z^bQTHu4vKHTLcf@8BJQar2_riX2a97+QBpQJ?+r%YA-LN>2gUrB@)|H{qn$o5{<;P zI*qm$;W-c5?M0I;16z{i;$$w|B8Z$vTLGgbD!NFNygc464=3XrAZZLZZj*@f0~PDj9be)1IJJotFe=21_sp5{lq_pQn`!wg%4 zH{Mc(FYNm2y1Lq$x*GLYTVD^zYV^0ay9_bR!G{dPGDqN;e1vasa9dF3z4X|Oq64D1 z`YIl!r$l#@W+y_f295qe^p#_Js*h{s=OD9ZQK#f!N6~pntZbT-1hAS_R~IHs2Q?A zJ`0_Kr@^uWw7k0+cV{P`F_A`75oxrUEbTN}&=F-%Ytq;g=v+sW^$MgVVT@>^{rPCp z&oGpW0-&jaHj_1tfkjX-ibl5B*)g5C8(W&J69ADgPQ=mve8lNz7{pP4h@;IRycT2F z%khM`(XDoNoQN9@E{vX9rk{8Ctv`Y!67CX7v~MCw4;Um-fJjm~Ns{hjN#*4? z;11!Nl8qmN^tX;-ED|)qf#n413g_FWXd6bK;XkNg93GjLi>Q28340T5-lbT7hXE31 zh-%t5QLP6Iswn`f)77TEGs@1O+PyY}IWioi*c-buQ&zjsfxU)_ywyXU_f zYkCyNI`BZkDiaSBHSs_J;z7?bcu+YB539gKiQYq&GZK$<_x413qN8IJ58*xw&fHzc}u{yuK*RUF&F2MHk)9~3q5K>^}J&oTH= zISC&j@KLHiSk@I%_knoi*40~=wcGwz@7ym?zhgJZC85VeE=5h`QUK)E={W|uDu5rP zP*O&FyQlP!x9OrjD}Ezn*Do)yn7`hGeSQZ#f>TJK|J*Q!2R}tk)KP$_({l{!R3J%R zjHuhFz_&-MGXFC$rYMfrK{g48Oo~cT6WJ6XXF$&}$W}RtGjIsbKvv=mpfCG>U<2s= zSP_obVk_9S==<1G9RG-Q71TAZZ`ioLZbMDDwxOZ1t}%mQS!OL7Oe;nY4`xifG4N}7 U?(>{s^vG6qm)0PlO6hyVZp diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml index ef635a6ab..3c143535d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml @@ -174,7 +174,7 @@ - +