From b3ce05c204c8099bf2c7b93309eaa3fb3869bc8b Mon Sep 17 00:00:00 2001 From: Aristides Date: Tue, 3 Oct 2023 15:49:37 -0300 Subject: [PATCH] fix bugs#AL-3303 --- ...ilhetePorEmpresaAutorizadoraAnalitico.java | 24 ++- ...hetePorEmpresaAutorizadoraAnalitico.jasper | Bin 50587 -> 60957 bytes ...lhetePorEmpresaAutorizadoraAnalitico.jrxml | 186 +++++++++++++++--- ...lhetePorEmpresaAutorizadoraController.java | 93 +++++++-- web/WEB-INF/i3-label_pt_BR.label | 10 +- ...orioVendaBilhetePorEmpresaAutorizadora.zul | 9 +- 6 files changed, 267 insertions(+), 55 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.java index 1b63d47f7..a88fbe820 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.java @@ -70,6 +70,10 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico extends Relato dataResult.put("SERVICO", rset.getBigDecimal("SERVICO")); dataResult.put("DATA_VIAGEM", rset.getDate("DATA_VIAGEM")); dataResult.put("CLASSE", rset.getString("CLASSE")); + dataResult.put("EMPRESAAUTORIZADORA", rset.getString("EMPRESAAUTORIZADORA")); + dataResult.put("EMPRESAAUTORIZADORA_ID", rset.getString("EMPRESAAUTORIZADORA_ID")); + dataResult.put("NUMBPE", rset.getString("NUMBPE")); + String formasPagamento = rset.getString("descpago"); setarAsFormasDePagamento(dataResult, formasPagamento); setarOsValoresDasFormasDePagamento(dataResult, formasPagamento); @@ -113,10 +117,7 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico extends Relato private void setarParmetrosObrigatorios(Map parametros, NamedParameterStatement stmt) throws SQLException { - stmt.setInt("EMPRESAAUTORIZADORA_ID", - Integer.valueOf(parametros.get("EMPRESAAUTORIZADORA_ID").toString())); stmt.setInt("EMPRESA_ID", Integer.valueOf(parametros.get("EMPRESA_ID").toString())); - stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); stmt.setTimestamp("DATA_FINAL", @@ -143,7 +144,9 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico extends Relato " (NVL(c.PRECIOPAGADO,0)+(NVL(c.IMPORTEPEDAGIO,0)+ NVL(c.IMPORTETAXAEMBARQUE,0)+ NVL(c.IMPORTESEGURO,0))) TOTAL_BILHETE, "); sql.append(" cs.DESCCLASE CLASSE, "); sql.append( - " LISTAGG(fp.cvepago||' /'||CAST(cf.IMPORTE AS VARCHAR(10)),';') WITHIN GROUP( ORDER BY 1 DESC ) AS descpago"); + " LISTAGG(fp.cvepago||' /'||CAST(cf.IMPORTE AS VARCHAR(10)),';') WITHIN GROUP( ORDER BY 1 DESC ) AS descpago, "); + sql.append(" e.empresa_id EMPRESAAUTORIZADORA_ID, e.nombempresa EMPRESAAUTORIZADORA, "); + sql.append(" c.num_bpe NUMBPE "); sql.append(" from caja c "); sql.append(" join PUNTO_VENTA pv on c.PUNTOVENTA_ID = pv.PUNTOVENTA_ID "); @@ -156,9 +159,12 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico extends Relato sql.append(" join RUTA_EMPRESA re on re.ruta_id = c.ruta_id "); sql.append(" join CAJA_FORMAPAGO cf on cf.caja_id=c.caja_id "); sql.append(" join FORMA_PAGO fp on fp.formapago_id=cf.formapago_id "); - sql.append(" where "); + sql.append(" INNER JOIN empresa e on re.empresa_id=e.empresa_id "); + sql.append(" where "); sql.append(" m.EMPRESA_ID = :EMPRESA_ID "); - sql.append(" and re.empresa_autorizadora_id = :EMPRESAAUTORIZADORA_ID "); + sql.append(" and re.empresa_autorizadora_id in ( "); + sql.append(parametros.get("EMPRESAAUTORIZADORA_ID")); + sql.append(" ) "); sql.append(" and c.FECHORVENTA >= :DATA_INICIAL "); sql.append(" and c.FECHORVENTA <= :DATA_FINAL "); sql.append(" and ((c.indreimpresion = 1 "); @@ -193,7 +199,10 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico extends Relato sql.append(" c.preciopagado, "); sql.append( " (NVL(c.PRECIOPAGADO,0)+(NVL(c.IMPORTEPEDAGIO,0)+ NVL(c.IMPORTETAXAEMBARQUE,0)+ NVL(c.IMPORTESEGURO,0))), "); - sql.append(" cs.descclase "); + sql.append(" cs.descclase, "); + sql.append(" e.empresa_id, "); + sql.append(" e.nombempresa, "); + sql.append(" c.num_bpe "); sql.append(" ORDER BY u.CVEUSUARIO, "); sql.append(" u.NOMBUSUARIO, "); sql.append(" pv.NUMPUNTOVENTA, "); @@ -204,6 +213,7 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico extends Relato sql.append(" ct.DESCCATEGORIA, "); sql.append(" c.FECCORRIDA, "); sql.append(" c.CORRIDA_ID "); + } }); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.jasper index 49a50227ad1adaac46abdcb16c165eea965c72f1..8fd8577b4d5e67c47d08a169beb4e4b679a4038f 100644 GIT binary patch literal 60957 zcmeIb33yaR_C8#7m!t_zSi-8J5fE84EDA2*lAT~Svmk;RL()KNl8&7Yn~po`DDH}i zJEEeZqA2c&f+OzRjN^i%&dBKKIL_#ZI^*c~o~pXHZ*|{v8ezWY_xzs;bk)6eYJJbC zs#A4qS@R{cJECkbc{8mjG_J2$*2 z#`;OmEsbsS#?{86;kJ43*h_hg7Pd5YbezIYXU3u^+doy_<}`L7gEa-P5;Hiaj18%- zEv_%BYN#!)Da$W!m{D9)TUJ%sP+wM5#)5Mqu~?+FqA`j>mQh(+I$PTcBb{xrGRg_P z)wVY_A!{!6m~eA!{w&rfJg+Sh4OKTHWMeEGX`97z!W|_ok;Yh|2v-t`#6nT>*iqZr z+S(XhTp3yj@1a>N*L6B39Gg#W(?X5Sp=f?vvlA*i+))>fwS-idGM3d6nj4cDEnqz( z(Qv2@fFoUy+C>cEdGnF$9`qveSO5Y*ja5YvHL@Qi4^B~g#3JoZY}pIvhuSJ5#KF47 z?V)m(HK(!ZUkU%7Oj3j=AGBxfmzqVjRKV)(pP&mS`1)qoF3sR*W5xGGGiT zjjQQwa|0B&b+#g&po~Z2Kt( zmRN0UaZ4!1_UR^|@P=R+&7oLhxJ6~Bmwc;r3c7E1u}F`Ir{CO2w6!r-(%2M>L>I>; z9FT`wMSZIc#bT_ttQeiKa0}`Y_RAFPRyKKc# zvD#28Rm>S}LJ(9@`*;LxMq^7SFq@dNw1TZwap_cC6(XwTRS7MLy-KThTv}C96S_~T z+LdsT(rlK|L9B&TjOg<9KN8emA{HbWo0{8H=$#p8lm^ag4g5Y?rK9Bz6$qxTum1 zjX?*gt7#XCLSJF-20w#Du?7K)@u`yVC=PX@MX{1_sKrwa2BfYAz2-zBC!+!`uiz2^g`XiK>5mEFNUBqiaKQ#PQYiJzv&t3*5l{Ef6U zQwpPzxo}4r5)L=1_g>+S>gKt{t#d-n%^}BAZ&9PeCx`0hqt%}`U-=D^Gt`o1YG#yM z&u~Y58}NoGi1Hx`q2p_S_9m@A8P1;MtiYt`fK4XFQxL(hsyn@}TzUlFJt>SD-%vDQ zdmoRJ!Y>VlkD^rZIM`9k*x638Lf#?Yg7GS^7^6fR=S3Ua=f{97L^{Rrf@-z!O8IRE z;B8G2k|7l{IhE*ABL_MfjD5t|CmF|}aMythL?d!wr4Z@myel}yrOdDpry3Q5!h*(H zT6VHs2X7t8f~%gDzUUER;ihD1ADBc?nLDui%+2t|DRPK*C1ro_=_Zrfl-*OcDP_#n z6$hcVkg8tRRuV?De$0F{j-+*pPEb&wN{66zH;a;V%woH#5Y)OBiQ$*iL4t^$vnJFU zSr8)0BOjt6E?~j-NJp54pQNv0oZKP1S9&XB_CgxEmodHwzs1lMX_(tY4IHr=tyF*S z=n$Iaf-vf5jHLz@!%NSY(g{Tkq*srl6b2(n3;;vkB+ZjUi*{uiD&f9f&{U#n4Bo3fP^-lK1^|=@^p*kc z*g)tbh4Y~vhJ?a4GEwWN5IN8X)KFk?ycB(`E_M8iW};x@V{E+Hl;Q%a+|<1pXjqHF&8L@ATDRb zScw?<->Wa8j4A#qXq60_gC2or6PLX znyZKQyy~Ni3^_bw0UDPb*e$z!R2d%-tn%WLIz4vt4EGjS}Nw@Q$wi+6W%nm7}Jrfl}iW<6152Y>A06BH*M_m)mK}Hr;he*|i zQo5*+6htJ2mb<&LGs3yPNx$$@t4Pxd3C(;)k|JZayA*#_f+kAhp_6;~4C?b$9E${) z=}s;n>jh%+8o}d;((pUoxpE0wJS>kZk;I2QL^URrxOvn9Ee{!~R01%UG)&P9QYz?m zg@fB)q4UcoAHqR3)oD!9kZg${s-YH+2bni3xfVl=e`Y%lhsG1qF0{tHz${ zI+b9iYaB|IA!QTjfeh%EOVNsRKsKzioTkK$c&41+@Fk=_CPa!gN*>cnGX2RD#9Sxj zIGuRWKw52)wh)1pvOV{J zjx)kM9uxFXmE>^4Wp{To-qUN`+__<>EfGTtEgQiOnO^=}jP;4R$ZRj=RuCf1P&o!; zjdNcmYJ4MvV zQ(1m-S5_Uf12s9Wp31nWXS2$f5pITF)-=Df?PTb4+ReG{h%wGWi zWt1~vT;c=2r24?`C1~(_2^##0&;|ULI6%2}D)>kGz~4u~pFeNY-EB?b#vPG-UP)YT zCn)-mkwWsXDLHBD(GSnq)<697(u%XI?%WCJZ=$4xaf1)^lIjD!m!LuKC1}tqLKo2A z;6m;^q=J55AL#oItBkaUJc6G#_B48blCT%GNDiCR7*P{&`BK;uTc!(MIccuOL1Uelps`L7 zl2}LSw}^b+Ex4vD6GRox^w5!touho%8Kl0W7GE<%t?AdIiHunTcPS@VkG=NdO9DL~ z_|p@=Iq<~NElE0a8gozIO!#5ob(bjPAWnQPCmI)oE+`L$*f`3q2^7u z&I?Ds_IILWFggfrzy9r?L=eW;K5URwA2xUi8XLR>jSY&B z#0J^9f9+({wW&-b*7!?O%J=hue9*95RGp@1c+;JmZj0pZuyS|_n!^JrH38MGP*83Q zZ=3wXrQ1Kb>(LSY8~3Q#!{yShR8Y7L21=Y}<`LMF@u)1)2B)2)@i~-YTX9@I_CA+j{-eG=Mx@PX@qxZOE#nb(t zFRS?PuyYErQy7zd*eR(#?DP^ec6tdKI~5@XJ16fHJIDL5v(K_8?)X&yy~j|4mT@^o5Gmp!%a!`;ii|MannoCxTy#!xH)a7 zxH-XxoBfB?Vx?7QM{aXtZZ$UhU{PrLJ?H+6Wz_Fdj-K_zMa6Gzo%qGN6RWly7%05- zzr)c6;;1lY`EXQHeK_hRXdLwtG>$4l3Xaa&DUMF`;b_({EPGf0l{WqHAiB(qf9_H~ zUc3G6bN_kmH}}~4j(@MFzVPq=9X_5yd=y5D4<9AfhmT%@#z!wf3We3}R~mjM z@j)1;`|v?hefZ!dXngPzG(IRo5+B5Xke@Di;5Dc`1P1<+280LtU>+DIKJ}%qaMDc5 zMv6WyxX;>_8NT`L4b}C}_Q)u?uV_Ld+<=i)lhHlomk{K_Smpz{r20VaC1{X)2^!>z z&;{hnyl9K(RFF^dfjnziNgjHhd65ZeD-r5jSm{RJCF! zK)-=N7sd)7&?VIebT2^z-Am9wSA;G=U$H}=Pfi8;#2o^CM%tjS+`jh!V|`YjV*Ql1 zd$$)rQBcDs)v)YlTD?%5buihch5Ap#$IBZ5sRLc5} z!H!AsG#i+e6FO0WxKy$|e?>I1u%puz4XXs|0n7qGA2 zA=nT0f!%Fj4%i`Ce>`o_FNyH0udG^f`t*IPi)T-*1h;;%tpA2U7sh5E&?VIebT2^z z-Am9wSA;G=-@HShAL0YLN7i=;cI)f3VP9SMdBdv1p0=OJ3~f37oFmWM3D|#2unXf& zAJ`?;2X-$(gWXHeU{{1LV1ILmU_Uf9>^|LTe1SZaA<+=;2^%Yo(p@~PcH0w+R3UMmjS1x^F(mj*17oWYUW#GU$(|_1`+`lK>h4HNq?vm<* zyO*Hh?j>lrD?$?P-#SRSb}HPb`rzKTu&Su6w5p+?tbAH=U2$1Wl@nDO;3q6rN(KHk z$A16m?Jr#R#aG22j2QA+hmZ)qVLC{;b}H}> z^8vrN5c(a5-d(GdmfT-;)4{)aq~fqc%HO%|h?DLv?RNEwTb!=i8>2r#FO0rE&`YWh z^j?Any_cXtuLw!d_jU8=JfwpDa9`-_D~fBX8mjYaYtiadIPr8R_3l^Lw4i_Zz-b>n zVa(_l#QUGutGsg9&P)9;f?gPV`9LqJKG1s!8uVU*2E8IALBE%SlxwGg{slDdkGrkijV~P6bEV7P6c_s59GnRvTCTsoQ-16CGX ze)OQHZhqr5qvYF;>x+Ur&w$y)0AZ*dU?)0px`f$243NPjL1TcIpfNxZ0FI`}8#7(t zorhEmDD+`KW_584p12G#<$}V z=ha#Xr#!O2J}b?PlL%vB%#)rp@Fi6ey!-N0FiFtB_lD5GSA-<+=ec=w9#Vl{?jPHQ?FBTiqkdrbR>cyj0HZ} zOR5j{UV?_bm!M&<2uav4aP#Oqq{6<~2m78y`E~gXGs=9l$r#IOZXQ=rF>W#bWHFN4 zo@mm?v{aq$MKd4x?z2xb__u!_dVA$<`Itc5Sr%MCED*+09~MZe4-32mjRjtU#sWo1 zV!=`edDl+Gf)XDVWE7S|olk7{RU4O#xVz#fEumjKdQ8sQeaBx{asS)9zdE+$vYkhK zIUz2LD}4}`R3F5>1PyU7K|@>-k`TYrMcR2tg?OnC;=Sss>Tt%Y8p1lUpj@Qqq|xrU z%XHFW!L84q(-s?0*m~jbLhBybuj;FvXTj~n0%5H5VS%Lju)s^uSl}gSEKr0b7OZqI zbL~_tnC8QR-nDi4b@jD7Jd$NhVt7VbVWO_nWrIWN<;Ju%oL%3<)5ae| z7#n;bmsB6fy#x(%FF}J`5t1O^;2`bVsUV;319?_SRZT^Hb$)5p1Sbw^ZNwUe4tm;0 z#i%RwU#E@wuGcGHBh-cQvJdK#>VvwMprP(1Xs9bf66!BINV#?@)Q|E(z4wg#@~WCH zp--cshv+9Pqxk<Ry6|x*{Z@{uc)+*G`3cg%9cpqMrzT znxe0-sz}9zUEk{eo0uSs?|qmcsXk2b5;P`w2^td=A&Cj!yWl$yshCjd!-Tl#AK*lh zj_B*lDpH}o%SGSpfecC`BN=r?O-5ZKcv05~Uep~zBI;&_gOqEhLcPid^#svRggyTl#xe zw&08_I?r!M7PzSE7)Udf3tal9I!A35!|B8oIOeVZhn?g6)0$96q%+zSstDuM{kC~^ zIC_Upg`^YBu|THVyAZ_D=Qwky&)jee4yTGA>qEuthnVKkA@=FSb~@RYfCBsC^3{cu?C9}Xn4d~$T#@CJ7ii$*H}CBe z@f_n?B#Tb3Q}UXv4zk6a7IYN@xeiLqw0`LeuD-x2gZRTyv+;95akeR{wrD2J!$Hy( zNzrK6q^bUtL6X<^q!%u6X-c}G^i>s}Q2j-*a2L+}yn^t&qEJ(~702KT4^%X@D8LgS z1rE;l?DTwVpJLMsk~pW9UMTMu08a>c7O*&R7EL~mK_tdenVsn)kKb-kaz3u5AHw@R zH2qNOJ5u@q^m*X)!>Jj2Pkx;aN!&tgO96nb&4xxAXJs;#)ON!;f)i}fWM zE*+z*PUL~k@+!DkV>E_K-EaUd?v|5xC@ClMIg15P4u#t5BDgPRKHb_js5RU+P29Is z7r|~>5tcln|7fCX>KqjSx1go$;-}X*KA|im-`$d<7fopmY1~vL@APsYQHSsL6xyP8 z-B&-4lUmA6{a^rnyP$aPcEc&G9w*&%yw`WtZpl76Wqn+l`h|l;obf4DZCoROD;SzO zaVHqm58UDtZflB)o1I9@p2g_SkHvH*8SVkVS+vastOpd%khp{j8nq{^f;Ekk=L_Qr zDom4kmhI-Fl$3LV6G!Ryb6qKSD#g?{7|=PLT%j zo3xw_47cH0hQ=0=pM=qcuFGW!?7Sr+^{tiNH%%+fkz zH-TA7AiW3W+l5v2m37qOF*>9(kT|@=A)SNULJM=_x}G{Ke$<4~Q0dY-H8+WYKKW4R z@VXi4k$y(TBO@`kn`-qNv_3&X?CoeAKTPb_mp9gZBensVuA00d(5puLjz14v$ z#jSMNTl{=D5oy=rov>^*m3Tj~u)g@RsYmgQ&)+P$=gW!=2O^ofw8i@if>anjpOz%y z3m>dyFdwYF1PyCN006pp@7SlMfr(f{y!$Beo|(8{6=`)Z;*3@k3``br1SU2oiuX-7 zoww+Yz}6$}r{A$xeN%qMFNFOEf?XKjNjx+WmsB6vy#!6fy#x(*MM#4EJGkh79udcc ztS;h%d|+2&)r57bh%*h$lb4L867^fJo>_WP?Tk^O2M5=ml2vuqFT>o*M46;vCu6Rt z$(U;dFXkG-i@8Gp6q=}8whlPnQei&W2lIYP)M>R?!eX%m;9WIe%&yCvr096L=y+v! zypPINwzDyl7g6<~KOq)<2uJlrhQuVXiagc#`sb$R9x&kW7Y-}jD^TjT(OSzy0lV!9 ztRa+?Fb4UsOj3PV<|Sw>^Aa?cDFS3y-LXOWbNT~o&<-&!$7P%$_)ka44;iL9yt%-Xft;{UF*zOowlItZFCMe$#J!zqgWWNJOnIF~!gVC#3x$*>y6~Zg z7|NGKqL>nH#XNP}yySr)hC%9rIsai$H?!Q?ZTKjFD>Ur2UzxWmB(On=uD zS69{4H567=))mjJ69TEGlt-r;TFXnY>GBiY^dLf6V`Yp3RE)SHEWZN#No#5wuv*I- zaWA3ci`h_2dTW7uP0z2bF0R2R zuN7acv`C#C)E3s1Ro9gldvbuQ%2P*~KLx#@1;#;Go5we9mb1zt0?cBz z_*9jiwbYE1logj3X(2tIKIlW3mShIXfd;~xP|8L}eJ(E%->bEloVquotfsC$zr1YL z4#bLS(r`4^iEDnBBtX)?thS-76vO{wEUhjrtHkYudIRE_tx#9#Il00}3xikD6qHq# z;Xng9f1u#>fZ~1+f@F(8St3vgQcF8Xw%9~2u200Iew7zb|8FTyTA9RvnktQ9-Gr#G zt;YtV9Y~`W)=*TV>8zT88zb}6&s&zG9h4P$19>1<^JN<3nJSbwh<}N|3ZcL3h7LVb zsF0c9SU4JL$7lMyC6P!g)*LynxMJCT#wvtK{tfRU5p+>YM_y=AQ%h%aC=Xi9yl`6{ zomrAMF~*ME!Ep3lAWz(Q=0gLV0sSv4x>fTV6D>5K9aS zb|Qu*@d=}25fmrM2+<@=YwVbhp4`rS@0m>lPkh5=CsqzU7lzXQnYjbM|^N8Iy@ z7~|uKcr&!%ShSNq!&}!ojyEYs@p)Zxz3js9af|+R{}am|8@IM;^}Z!Tph?QL7b!GJ z=Oe!SF*8pwdYNgbA717%OE6RFla$9N zyU$}r`f2#)F*E(}3Q5IynM+sVq^ry?nfH4IpE2PNf^XK=SGZD;m6$dLjPYHn6bsO# z-qJhOOU`$bu@U1$p>6rD8&Lw!7`$2^x=Hp-Gs(Up$za-6|PnzDP z7bqi@N0v2d-j7JXyu7`3B<%s-LdPc_e{sRHeG+$8sc41PXWe$L#J$r^R8Bid7CZBO zzqqJ`z5P4!n1+MvsX^2GPN6e|a*f1|&C z@k_(4%KGwhN_3Q{qVbPresg#3M>7L4B-}V-?+$<^#z}K`7hmy6y>Y8G_qyZC8|PeJ z*$|&<6^WK3vYv7tuiMExI~SRi#!#s*oan^n5^^QMogz#mcqi{vd@_W0^3EZk`SY2) zvxmykdQ8u(YtqM@V-lsqhEmnqF)yzzLL(;+7G|pg6?;*jXlmof=^KxK;G4-yqn*B zaL&O`p7wsh;^=rSRDHt!eD5S}FO#Bj>@vp$U`7l0lP9c%?>Lw@ux*P_-cU@iHuzt4-cE5MTqVvap zHv6}e3tsVMDe+?R&T#WYia{9ad>xIOlIp`vFG1s`m!NS|5mIn-wg5X#ZYEXZ-F>*} zom5KXWS5oL{fH*oX0UV@@^sZ1YpqMpd|>^^C*JCF!m(wY{~exElOR^)*lm(^8c!wF zho@eG##1jrv*tpEd7Mo`5bDW>0sp8qGO4ou2qy3VUnKY5QPzciOuBD zL?)nrbZ1bV_{hfWSjtT#p3jQq(5Pi<^hME3y%@PiGv*_kXhkZvGP%#`ulJW)MJ$7j=h;q`XRPzY?y?q=k^beZ2R*Coj!n6AnZ_97 zFwftj)^cXHAnVo8KH2b;;jld?)P~j0W_w6%8tT7@l7@OIxXK-^B-2?HFeWYOzvu5I z^`FkX=(}4NZ(ej{|D&eUJf9M**-pbnf_=4I6p_}_%_Lq(M73d4psuRAp{VMZN+H8Z zby(D23MN0q?+Uf~%;Wwu=!B}X^Oujm^W26jrf+acr)f`A)UyR})r4*>89Ssg-$F46 z<9eS~KvI2L0WU#o1-t~U6;Ol}&GPl4-ge#9+83s35%x@M5%gvm;vS1eI-I6K;3OKA z#Aex5ml=i#8Gk083YPB*mfrJx+uGmV9KQeZSH3KG?y!;-U9xntm{?|2F=pd*)@g#H zJI-60aJ7YTuMck})rYrUg2r1fLF26=q~I+k!132LZ?((Flhmla5_yZIF#X*H+v2+i zeY+b)i?zj{VlNi;#ZP+6oi^>z)>c_wr~U?=R*2mVX5*k$w&yNm_I=y)ZfvU?JY&xG z$J=(hzo^WY*&;RSvNNd?+YgG2Cm5o7ryTZfp|HY`A0OC>PGT-$iw~n^FiFrD?Imc8 zR)iFcepcZBOBtQ(GTIc#{0fzLU|hEfi)FCb=!+Fdk`6(z#}0GXKam#Td==G2fq+O* zz~VLCVg9ZgCtYyqf5NBq8T^;W&)IFnvHz^<@-jO)PLh1D-C@4}fl4KecO@4!zDueP z-@OEl?_Pq&cST6S_jh-S?|Zv^&vf~Yoja~h-H6%FMqiF&;jZ_CoUb1UQ7|4E_A(RD zw49EsWpfFUD9Lf^T}siZR_#W7O=BwE{g#EV|9r^B-}B?1IOeOTPN>-3siv|g5@Tj1 z3r-$HUj5YfA1GVG@LBpR2|xJoUIz22^In3+dqqHoL|$C=J>}Bhq$Yfr%VG7I6-?>p zVG1Tir(r3hQ*2?2^qi(TJ_61{bBP({T{r^1_IH0Ty>I!!3tCTF+sRr=(GU0^b+S{l z8X0s3jWjF?rMI>!YBI+(g15G61TV)NLf5r5!xH%Z(pGwSYF?@laK6J!s%_}LWHoXp zyAQ?Gm)IJVa^;-(z)_8T_pz!dmUVS8*B!vptGY6*os;mzziI5~Mxcx#GSigh#P!JQ z`W-Xs^({wDz4!O!8_NzUTjL6eXeZL$DUmUhq(B(E`$&PL`bdG7phx^ z%}}3hWI=^VB|&|nzohxdnnYfst@Qa+8;`B~W&1w6fduXZI)ug#`}1aO7`4ygFFsZl zzVFEk7nT&pu}8ubpxe(#8Dj}|VT|^{T~d8;_YySRy#x(+ML@=M++F3=#ma+wQhQmO zh&#F~T#PQRUoH(r8(Z8P%|vusQ|W%SqfIFZdx26(_=7#qtIzw#aToky>z3SbZsikk zlnLUrCH!DQS{Oc8U`xWmK1j=8lAs~&C1^-1LK4#Q;%gUXJa~{!lJL4jq#@y5e3y?$ z*}ateYzRt){k0!0{Ok1U@buUV-@ZO#zv5eeA@(JNy)fiTJ$9lKkxMA?!CnUQ!QM;I zuvdg6>_w{?$Eh3a>wU2ITO|;WFb&|7cLk*a{+x|Jex4hRef;IBwu3e_mqi`CWV@2K z(AN>Z!jNldb>Jn{2Y4?*6M8Q}16~o5fUk*Tq@Gd<{R|)AyIi6WkJ*d9+mlZeJ$ahj zd}*;lrT7L;8!5Wz&vD#MgIu~VHws`9cXFy_5K!sE^V;&J*Em}tTHCR-nm)9PPK}BA z+;W!Fgc+cYSmT^R>=98Oz&5i0+xDB`8Qa{GDFa(^$`?hIL}h%D;HY(rT1VN(T}R0l zQG@JDz~V+@cEOr&27R9qsQXB*TAcFIi$6V%89tWBzvAr39oTi#Fk$i`lMk45@Z^II z7(ZcB!-RkZ0V#8KAFtq zY><0SScA6rgR|5}CaB10jyS%-hqK+{(W$k7?)CyLEp1UUXL}|E)0WtC);I1!tuW@S zf07$cQsHc`xUYE!AU;U_8TqE_&RXTh9-xgbMDpF1kUzIqDxU0J2W^Okwo^{ zmY|{FxANT&U3X`U9}#O`XZ@sq?+uM^obrrBa7+48)k8Zh zf~rL?NmlnzaWGfq;;0Suj0JCF%7jvrkQkSBbpA4q7Dm% z^8$5ZAnjps){t{HAzcY_7rjHM-Kex>;mEs7aO)Iyd;m7rJ-+1G>)X4?n6u%oZzV%M zCysbSd)Eu2*1Ms-s~*K=I1o0S*ih%Ldqu0K)6{BUkB4}%Ws0s??(P?|D=HQ&#dkiV z&ijScy<|+K6Lb#e%p5g(24_}bq&XC1)7ep3%wiQmX0wbQ%wSbPmMNc(4zhrJstvLp z@~J+^vgFe-LDo|~9UEjp`7}Godda8bgDhJDM2<^K6M1y5c$*@WV^|yg+aEvd|Di2d&s9# zgKVgL`c;taDWA>=vc2TfSwWU7pUw%gz1c8AV`-2Lmrv&h*$Dac>mcp~5Y&r;Y@~d; zILP*uPnQPSDEV}Gkd2m4R|eS_`E+#=pKc7Yaq{Wr zAR8~AZVj>t^69o9hGrt{?LmBw7EgBu*@5!ut{|HvpY92=$@1ymAUjAt-5+EJ%clo| z>=601F31j*PY(y#6gHJg{z#A=CZ8S)vcu)m6G3)_e0nO#j+9SN2U)&+dM3yUDX90?0Mq?C`_knc$1DbzL9Z4+pbxHc}baw)JFxVt+U~ zExYolsj30?H_n`0Z~^vr0OGW!Wkmt@H5yPAOxH>S?4RJ3+kA`N-~qNB!Q*;pfPIfP z-SOj5Km+Vw;EN)7G|vG05e>6)_fa_m>?ah%PuC34S`7yYSIG=;Bkt;ImjP}e>$+MQ z;2FS7r7ZQy07s-wCOwK|fM;>$-M$*&!FVdJ>KNeJ=(wH2S2;RkfcN1{ZDbAbesOqp zEiu6RgDpxu4Df;I*S&gSfDZ;)DTD#O8~R$6Qi3KJ;CmoBxmP8?_e^iZMKUI8L?+Kg zXsHAS_%KvgUEMe!z(*uGP7Lso$gWrS3-D2hM=E{+J_fn<*ZKl{KNL%;d;y*Z>GAOx z;N#&-^_u|>l_~M?)c`*bjtOdBfKLYBJUU*0AB=o@6}$jH6frC9F2JW!B)V!B;OJlV zEgS)UB&0sB)CG8f_Z@IRn~l>a1b7MZ;nC#+d|DES@HHKfNi8nG%OOfhDqMh9LXP#r z-UGZEk$W_^0I%U<<9|903)(wzuyiJ`Ln$?-Ex^&PYWw8^d?v~jSJVQ07JPVBv;aR2 z)!AuIG!0+u6ASPYhyg-Lc0}|)At^>$1rel=-O6 z9^bC}Nshawas_w`v}cch@u*Is3Gg;_5g|Dy92&tpDlhbL$9(}AO)h-}EyqBHrKsF8`T1)X!}hN7ALY^tsDXs?6=T>|`E zD!HdmlkrWFxjrw8pTp0G5I44Cbsbo>pP$#H&@$aALH=ugA;oYJ${oYGrgW}#V!2g% zL4Gm6g#2Eb#p|i?z2r9tmF)n(B8&Zn+{He6sYuXToJ@W-z>k06RUZWd{2FxP9kFOa zC+?IkDa*+0b$kW%34Xm6AI8}t!u_>xMhAQ779lr$n(S0fC=aPd7JKTYYHRB zk5H={X$^UN2KZyBONgr$M?!>J;pquTMRllo)2;KukpO>+dJUX>6K=!H(@3@s4cT0H zdja3%Zga%R zMu5M7%u2yhWdLViLfLWVZmhE-x4AL5y0N1Jo6-^EE687MD7pa2B1^APgAcrNXM`mg zns0_U2?S}q1+OJ}2ss;;f`N|LVjzu{C4>Nd5x{*_ z!M>ni_580$OrB5!eIkVMmVsd?!wABlktm)F8ixuSqflXE3@U7lK!uI*r?4^l6gI}5 z!p6u`*cf*T8>3EPW6UXRj5vjj@usjb+7vd%n!?6NQ`i`13LB$LVPlLbY>Y64jq#2>HW6UUQj2MND@uILXS`;?Mio(W7QP>zK3LB$D zVPlLaY>W_vjq#zdF*+1B#)iVi$WYiA7YZArLSbV}C~S-fg^lr`urV4GHpYU&#z;`u z7ze@*Fix`+FtNzc=zv^seB`eh^9ZXP!yjhVWYmyRN5%{?W|A?BjN`~Sfs7N$m_tT0 z8FR^)PsT}Pw2;w8Mmrf%GGb&bAY&03OUO8ljMK?DlZ>;;IG2p`$hd%v3&~hU#wBE2 zM#dFnTt&umGOi_K1sOMxaT6K0kg<}CRb<>j#%eO|CSwg5_mQ!dj0eehh>Z1QJW9sn zWIRd61~N91@hlme$@mQ!TgZ5kjF-uHm5kTPc=G`O&DmQp`eDFM%f>BCsr0~PN;alZ zaxj517*i)hF=;Xk(`*gsgWZwDN>B-km;aSVG5)UlOM-o+T#RF zcr?NHd`xn*VtNCIY_o-!(l`yF&%!jud6>Ys2vZlAVbbDi#I^zx6*pswVihJQ?!vUh zeTaP>1mRIkM?8gzh-Wbc@jOy{ndP%L&|JKYsfPEF=Z}#3HcTvhjwyw&Fq!aAOe6e& z-2B9j;wCHS0rarFSS89=#Rsu!z6U#+@6BrXNLI_ovN}GV)$>Vg20xS?!;fGyanj$h zyo}A_mB50t-?HDqq*bm5s)nl1n6ZzrcgO7a2-`Yl|3}z|E`kC(#^$0Kn}^A=`I!C+ zBMhb#WDLd?*Y7SEH3)j@I=Wv}f018R~VAzZGmLyB=>h zuzT2zYy-OqZR^dLd%T5x$8P0WY$YGcZbKWniWjom`3!ak53@V@X>2vWl-cFQg2UqEgEEY$atqDR;Fhcl8^2J#|}fI!1GPoScr;oSr17*_zV^aynjf z+DJ|fn$xr7)TlXaCZ{IN={MvQ(ww%C(>%@TMRE#jPA`+w$(qxvQ=S4-HsIgWV9G`?AA6EMqXW@sf0R|Qv8>{ep5WkK1 zy^7yf{65F;TP)#2e#~tAhTsPU!(4{nHTbQ>59yn0@p}Y6tROL;!w-2jp^ljE;rB6q zpW*ive%tZ;4+?AH*Au^f_#sX!7r%Y+%foLHe$X7PLi~=#4=b%Ll-oKLzhC2rbgkR* zTZbRYY`uox2l#z~-w(hm6TboY4aaW+en;R}f!}QW!uT!3Zz+CP;)e}T_GZcO&j@ZjZa0pO1NnowuI-lA%R>E!bdVaag+mSi^N;n<@$1SeoSiHULz756O>+V}`yq&q8U$v1hM>vkR zHt~jpjc@RFqC+#bjmhCC%ncyC2g2E|x0gWx0z`P`3BLT;NBGTnTu-?MhrbHzr5ye`tj#(6O;}Im@ZZ8(pTpmVb$pN_YO+_!eTp|p@ZFoe&++bZz}IplSCLm3sV1aDWl zZwKS;7WZuo-dq{wd*IELN}i23SGGCB8vsU}5C`@(-Y#%rVV~g5m00#R-d4D@EqGfg z-jFkllpbPhT-qAEfi1H3U@Z0!yW6E*hBpYZqMePm)h;cDw+mg`T)eG!X*2P5nfo>! zZ@+OwnoZ5&e?%rG!SO}cabLW>>b?!Z+nerNPYBB=BrN-(kwmYGX3=<&p`m3jp{IQX zI^P>;(%(dH{5G2P-}4LD`)Jy?@~iLx@<#SCzlCi>6aQzvhJB7^{tNyn`wC6{-}z>I zqkDyY%U@?dpvnIi--^#?+t|t1n9>yVjs4QUB_yprzKFPS0Pd2XLhZ@WI z6yrL6gt3YrY23++j0btK@h~qlHuCAlCSGa0%Bzewc&)LO*BKx3na1b*SmR56yzwnR z!T6rfF-_iNX7G7tHlJ_yF`c_}~DyoR4o%tMJVQ%3!nJ@F3&DZ#C=39J~ z`8Ho|zQ^w}Kj8P8AM^XnPxyo8XMCOc1%Jf+ia%<8&7U;4^QX)o_%r5z__OGLe`8tv zc`K8@WcB1PTiN_|s~>;E8o+;N4dHKFd+_(HT>ic_oPTKT%RjQl@K3BfzRjAz|6)zz zpIZm>zgbiHSJn~y8>^82(< zFKe06*Sf~&XRR;>TDKd6tkuTu);ePkYrT28Hd{gj3ey9Mxj02D6&Ty)9eXGnSG#9VIN^s+66|9 zU18MP)y6UQY-6Tw7JIqTZm%#-v2Qdw z?bXHt`yOM7z1}$0e#|(--fWy{KX06Czh*3h+Oq9`O3eS17_@n4=s(kx81<%<81<%< z81<%<81<%<81<%<81<%<81<%<7`*u^G34%O0FDy#7e6INIVvSay(uL|z5U-;Vvy0U zl^8|*e?f_n+;)^0^`?{<^`?{+QdQ(b_dQ(b_3a6A9^`?{<^`?{ zc+=ptGTxlL<-fmWzcbV1Z8nez^Yu20VOpGGU zS?1&B3FZc~!F%`N79^JOz^zGk+XZ<%f8+h){!&+ITiFc+F1n~Tg(%+t)z z%wL&bm}i+^nP;0{o9CI^&GXG4%!|zbn9DG6aG7P9ms^?U)mBe)xs`3Mu=<(TTLa9S zts&+u)*j|6E7!c;8gAZY?Q7m`jWO@D^340K3FbO$lKGHzu=%Jp)qKo4!hFgqG&fi! z=Cjt(<|eDoeBNp>w^(z`m#tRw6|3ER!#dS`(>mRJ+xoTnduy5bzIBbc)mmYGWZiCl zY^^r8S?kO{TkFlwt!KSs@|a_j@GLG}^WV7tKD!>+J~+SS(H_H1jIeS$U8 z4qN-$E!J4$Y|F} zj3WNOpu|ABXtw2lGcjsz2_Ncra3)5Ibb=D29F-EI-jouf-nvv`FvVUuvDqFR&u~a;u$RWySc7Rwuv3TFmdVmhd&!>HJ~q4F0Hf4u8fvmv6Q%;ICM} z#(crW{9Wr3zSX({^8#1$&#Y@O7jP}#ZrxyT>qf(}ZZ&#aD>2r;!x(DaiShkC7|*XU z@~pMSA=U%NRO?}*6yyHs*5gLK^@K6gdfI5RHX3s=2XL14oN=!8f^n(!qH%@ws<9k% z0@qn@8LO<{8h2Xn7!O+S8V_TBV59X1W0Unq<5lZV#v9hB##ZYy<3sDO#^=_T#+TMV zjBl;4jqk1PrfGd=W?26=v#lS^zBVTIZEo&i+h&oSVV2ri<}$mdd8ysoyvFWhuCV)? zEA0X1?e-A!E_*j~jlHM2*51opXAd_Yu}7GX+oQ}4_Gt4Ndw=seJI~x=Pc&b)4=`V| z4>I4f4>sSnr<(8ChnXMP`R2!Vf%%DDVt!_qnqSyQnP1uE=GS($x!pe6{K2j_|6|Xv zm^}-sz-%kiZm@dVCqfNqh8hsE2B51SVxI&Rpv}s)Bi3-c16_a28e=cA^6bUv_J4(L z|8(nM`)q5feGa<(^Q}Ut0wwk`>uCF8tIodMYOt@c=0GiIwXd<-?dz>m?Heo{KWF{g zzSUZ0-)>!F-(jt=@3wA-s<7I=-&$v{wbt7YS^JQJ_FMK~`}g*6`yG3vz15yze_$VIe{3IN|Ise6 z|7=&-pW4;-7xrxXul5P{-|evd54*+w)?R3Dx0l%evX|QbwlA=Mwy(@!_VNtNUXfwj zH)iy(S7&6|_he+->oa=Wk7eZ8n=|^`&u0v_U(3ja5`!zNF{g;{NCSL#<;K{=v^FtM N$Bv99wGlb`{{c0LCYJyJ literal 50587 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.jrxml index f4d28b0cf..78c7122a6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.jrxml @@ -1,8 +1,8 @@ - + - - + + @@ -37,11 +37,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -136,11 +216,19 @@ - + + + + + + + + + - + @@ -150,19 +238,19 @@ - + - + - + @@ -173,7 +261,7 @@ - + @@ -189,14 +277,14 @@ - + - + @@ -305,49 +393,42 @@ - - - - - - - - + - + - + - + - + - + @@ -458,12 +539,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaBilhetePorEmpresaAutorizadoraController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaBilhetePorEmpresaAutorizadoraController.java index 62827ac08..578cfb728 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaBilhetePorEmpresaAutorizadoraController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaBilhetePorEmpresaAutorizadoraController.java @@ -9,6 +9,7 @@ import java.util.Map; import javax.sql.DataSource; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; @@ -22,6 +23,7 @@ import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Paging; import org.zkoss.zul.Radio; +import org.zkoss.zul.Row; import org.zkoss.zul.Textbox; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -87,19 +89,30 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraController extends MyGen private Radio radioSintetico; private Radio radioAnalitico; + + private Row rowTipoReletario; + + private static final Short EMPRESA_OPERADORA = 4; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - lsEmpresaAutorizadora = buscarEmpresaDiferenteDeOperadora(); + lsEmpresaAutorizadora = buscarEmpresaDiferenteDeOperadora(true); lsEmpresa = buscarEmpresaOperadora(); puntoVentaList.setItemRenderer(new RenderRelatorioVendasBilheteiro()); puntoVentaSelList.setItemRenderer(new RenderRelatorioVendasBilheteiroSelecionados()); usuarioList.setItemRenderer(new RenderRelatorioCheckinUsuario()); usuarioSelList.setItemRenderer(new RenderRelatorioCheckinUsuariosSelecionados()); + rowTipoReletario.setVisible(false); + setarValorInicialCmbEmpresa(); + } + private void setarValorInicialCmbEmpresa() { + if(lsEmpresa!=null && !lsEmpresa.isEmpty()) { + cmbEmpresa.setValue(lsEmpresa.get(0).toString()); + } } public List getLsEmpresa() { @@ -346,15 +359,21 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraController extends MyGen } } - private List buscarEmpresaDiferenteDeOperadora() { + private List buscarEmpresaDiferenteDeOperadora(boolean isTodas) { List todasAsEmpresas = empresaService.obtenerTodos(); - List empOperadoras = new ArrayList(); + List emAutorizadora = new ArrayList(); + if(isTodas) { + Empresa empresa = new Empresa(); + empresa.setEmpresaId(-1); + empresa.setNombempresa("TODAS"); + emAutorizadora.add(empresa); + } for (Empresa emp : todasAsEmpresas) { if (emp.getIndTipo() != EMPRESA_OPERADORA) { - empOperadoras.add(emp); + emAutorizadora.add(emp); } } - return empOperadoras; + return emAutorizadora; } private List buscarEmpresaOperadora() { @@ -373,12 +392,18 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraController extends MyGen } private void executarRelatorio() throws Exception { - Relatorio relatorio; + + if(lsEmpresaAutorizadora.size()<=1) { + Messagebox.show(Labels.getLabel("relatorioVendaBilhetePorEmpresaAutorizadoraController.naoexisteempresaautorizadora"), + Labels.getLabel("relatorioVendaBilhetePorEmpresaAutorizadoraController.window.title"), Messagebox.OK, + Messagebox.ERROR); + return; + + } + Map parametros = new HashMap(); StringBuilder filtro = new StringBuilder(); - - carregaValoresEmpresaAutorizadora(parametros, filtro); carregaValoresEmpresa(parametros, filtro); carregaValoresAgencia(parametros, filtro); @@ -489,7 +514,7 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraController extends MyGen filtro.append(" Empresa: "); Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); - if (itemEmpresa != null) { + if (itemEmpresa != null && !isEmpresaTodas(itemEmpresa)) { Empresa empresa = (Empresa) itemEmpresa.getValue(); parametros.put("EMPRESA_ID", empresa.getEmpresaId()); parametros.put("EMPRESA", empresa.getNombempresa()); @@ -498,18 +523,60 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraController extends MyGen filtro.append(" Todas;"); } } + + private boolean isEmpresaTodas(Comboitem itemEmpresa ) { + Empresa empresa = (Empresa) itemEmpresa.getValue(); + return empresa.getEmpresaId().equals(-1); + + + } private void carregaValoresEmpresaAutorizadora(Map parametros, StringBuilder filtro) { filtro.append(" Empresa Autorizadora: "); Comboitem itemEmpresaAutorizadora = cmbEmpresaAutorizadora.getSelectedItem(); - if (itemEmpresaAutorizadora != null) { + if (!isEmpresaTodas(itemEmpresaAutorizadora)) { Empresa empresa = (Empresa) itemEmpresaAutorizadora.getValue(); - parametros.put("EMPRESAAUTORIZADORA_ID", empresa.getEmpresaId()); - parametros.put("EMPRESAAUTORIZADORA", empresa.getNombempresa()); + parametros.put("EMPRESAAUTORIZADORA_ID", empresa.getEmpresaId()); filtro.append(empresa.getNombempresa() + ";"); } else { - filtro.append(" Todas;"); + filtro.append("TODAS;"); + parametros.put("EMPRESAAUTORIZADORA_ID", carregarOsIdsDeTodasAsEmpresasAutorizadoras()); } } + + private String carregarOsIdsDeTodasAsEmpresasAutorizadoras() { + List listEmpresasAutorizadora = buscarEmpresaDiferenteDeOperadora(false); + StringBuilder string = new StringBuilder(); + + if(listEmpresasAutorizadora!=null && !listEmpresasAutorizadora.isEmpty()) { + for(Empresa e : listEmpresasAutorizadora) { + if(StringUtils.isNotBlank(string.toString())) { + string.append(","); + } + string.append(e.getEmpresaId()); + } + return string.toString(); + } + return null; + } + + private List retornarListEmpresaAutorizadoraeIds() { + List listEmpresasAutorizadora = buscarEmpresaDiferenteDeOperadora(false); + List listEmpresasAutorizadoraInteger = new ArrayList(); + for (Empresa e : listEmpresasAutorizadora) { + listEmpresasAutorizadoraInteger.add(e.getEmpresaId()); + } + return listEmpresasAutorizadoraInteger; + } + + private Integer[] converterEmpresaAutorizadoraeEmArrayDeEmpresaId() { + return converteListIdsEmArrayIds(retornarListEmpresaAutorizadoraeIds()); + } + + private Integer[] converteListIdsEmArrayIds(List ids) { + Integer[] arrayIds = new Integer[ids.size()]; + arrayIds = ids.toArray(arrayIds); + return arrayIds; + } } diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 46fe98c63..e3f6a22a0 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -417,7 +417,7 @@ indexController.mniRelatorioVendaEmbarcada.label = Venda Embarcada indexController.mniRelatorioCaixaOrgaoConcedente.label = Relatório Caixa por Órgão Concedente indexController.mniRelatorioW2I.label = Relatório Seguro W2I indexController.mniRelatorioTxEmbW2I.label = Relatório Taxa Embarque W2I -indexController.mniRelatorioVendaPorEmpresaAutorizadora.label= Relatório de venda Por Empresa Autorizadora +indexController.mniRelatorioVendaPorEmpresaAutorizadora.label= Relatório de Venda por Empresa Autorizadora indexController.mnSubMenuImpressaoFiscal.label=Impressão Fiscal indexController.mnSubMenuRelatorioImpressaoFiscal.label=Importação Fiscal @@ -1345,7 +1345,7 @@ relatorioPosicaoVendaBilheteIdosoController.tpTrecho.label = Trecho relatorioPosicaoVendaBilheteIdosoController.tpPassageiro.label = Passageiro #Relatório de venda Por Empresa Autorizadora -relatorioVendaBilhetePorEmpresaAutorizadoraController.window.title = Relatório de venda Por Empresa Autorizadora +relatorioVendaBilhetePorEmpresaAutorizadoraController.window.title = Relatório de Venda Por Empresa Autorizadora relatorioVendaBilhetePorEmpresaAutorizadoraController.lbDatInicial.value = Data inicial relatorioVendaBilhetePorEmpresaAutorizadoraController.lbDatFinal.value = Data final relatorioVendaBilhetePorEmpresaAutorizadoraController.lbPuntoVenta.value = Agência @@ -1362,9 +1362,9 @@ relatorioVendaBilhetePorEmpresaAutorizadoraController.lbLayoutDiario.value = Di relatorioVendaBilhetePorEmpresaAutorizadoraController.lbLayoutResumo.value = Resumo relatorioVendaBilhetePorEmpresaAutorizadoraController.analitico.value = Analitico relatorioVendaBilhetePorEmpresaAutorizadoraController.sintetico.value = Sintetico -relatorioVendaBilhetePorEmpresaAutorizadoraController.nomeRelatorioAnalitico.value = Relatório analitico de venda Por Empresa Autorizadora -relatorioVendaBilhetePorEmpresaAutorizadoraController.nomeRelatorioSintetico.value = Relatório sintetico de venda Por Empresa Autorizadora - +relatorioVendaBilhetePorEmpresaAutorizadoraController.nomeRelatorioAnalitico.value = Relatório Analitico de Venda por Empresa Autorizadora +relatorioVendaBilhetePorEmpresaAutorizadoraController.nomeRelatorioSintetico.value = Relatório Sintetico de Venda por Empresa Autorizadora +relatorioVendaBilhetePorEmpresaAutorizadoraController.naoexisteempresaautorizadora = Não Existe Empresa Autorizadora no sistema # Pantalla Editar Classe editarClaseServicioController.window.title = Tipo de Classe editarClaseServicioController.btnApagar.tooltiptext = Eliminar diff --git a/web/gui/relatorios/filtroRelatorioVendaBilhetePorEmpresaAutorizadora.zul b/web/gui/relatorios/filtroRelatorioVendaBilhetePorEmpresaAutorizadora.zul index 88f8db92c..1544bf5ed 100644 --- a/web/gui/relatorios/filtroRelatorioVendaBilhetePorEmpresaAutorizadora.zul +++ b/web/gui/relatorios/filtroRelatorioVendaBilhetePorEmpresaAutorizadora.zul @@ -40,10 +40,10 @@ @@ -53,7 +53,7 @@ buttonVisible="true" constraint="no empty" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" model="@{winFiltroRelatorioVendaBilhetePorEmpresaAutorizadora$composer.lsEmpresa}" - width="95%" /> + width="95%" />