From 1441aad35f293cd958f530d40737ae6f78a5f4cd Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Fri, 4 Oct 2024 11:07:26 -0300 Subject: [PATCH] fixes bug#AL-4336 --- pom.xml | 2 +- ...oBilhetesVendidosFiltroFormaPagamento.java | 9 ++++----- ...ilhetesVendidosFiltroFormaPagamento.jasper | Bin 57256 -> 57261 bytes ...BilhetesVendidosFiltroFormaPagamento.jrxml | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index df452615a..2fba9c96d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.150.0 + 1.150.1 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosFiltroFormaPagamento.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosFiltroFormaPagamento.java index 277b68ce1..bce8619c0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosFiltroFormaPagamento.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosFiltroFormaPagamento.java @@ -115,7 +115,7 @@ public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio { StringBuilder sql = new StringBuilder(); if (parametros.get("IDAVOLTA").equals("1")) { - sql.append(" select "); + sql.append(" select distinct "); sql.append(" u.CVEUSUARIO CVEBILHETEIRO, "); sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, "); sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, "); @@ -149,7 +149,7 @@ public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio { sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, "); sql.append(" B.DESCNUMDOC AS DOC, "); sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR, "); - sql.append("(SELECT LISTAGG(formaPago.DESCPAGO, ',') WITHIN GROUP (ORDER BY formaPago.DESCPAGO) "); + sql.append("(SELECT distinct LISTAGG(formaPago.DESCPAGO, ',') WITHIN GROUP (ORDER BY formaPago.DESCPAGO) "); sql.append("FROM CAJA caja2 "); sql.append("INNER JOIN CAJA_FORMAPAGO cajaFormaPago ON cajaFormaPago.CAJA_ID = caja2.CAJA_ID "); sql.append("INNER JOIN FORMA_PAGO formaPago ON formaPago.FORMAPAGO_ID = cajaFormaPago.FORMAPAGO_ID "); @@ -216,7 +216,7 @@ public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio { if (parametros.get("IDAVOLTA").equals("1")) { sql.append(" UNION ALL "); } - sql.append(" select "); + sql.append(" select distinct "); sql.append(" u.CVEUSUARIO CVEBILHETEIRO, "); sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, "); sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, "); @@ -250,7 +250,7 @@ public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio { sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, "); sql.append(" B.DESCNUMDOC AS DOC, "); sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR, "); - sql.append("(SELECT LISTAGG(formaPago.DESCPAGO, ',') WITHIN GROUP (ORDER BY formaPago.DESCPAGO) "); + sql.append("(SELECT distinct LISTAGG(formaPago.DESCPAGO, ',') WITHIN GROUP (ORDER BY formaPago.DESCPAGO) "); sql.append("FROM CAJA caja2 "); sql.append("INNER JOIN CAJA_FORMAPAGO cajaFormaPago ON cajaFormaPago.CAJA_ID = caja2.CAJA_ID "); sql.append("INNER JOIN FORMA_PAGO formaPago ON formaPago.FORMAPAGO_ID = cajaFormaPago.FORMAPAGO_ID "); @@ -336,7 +336,6 @@ public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio { sql.append(" CATEGORIA, "); sql.append(" IMPRESSAO_POSTERIOR, "); sql.append(" SERVICO "); - return sql; } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jasper index d565be6cd377e19e698cc2d5064005adab2f4d0e..4cfe7480810f922bf50688f34efb02456987f7e9 100644 GIT binary patch delta 4175 zcmZ`+U2Gdw7M_X!+L}UIr}?p+|Ip>3O`On>bhngD?MX5l+v9p{Hp;HB0u2Zn($u)L zs}-^GQ@2_zZNe=ql#0#5c8SWSp~?#qNP&kgl(xV_UqC8QBqZR0p9mzh64IV~?w$CK zGx*`?-ub?JzVDnn_u5`qaV)MlUYB#5o;WN`Nc(!`C5h}`Z1y-V!Q63)gmTqxKD?Fn z)wAI^k_RQ}a_=~Nkjd!p9Q1Me@(a1|o#j`?bCSzYlbTAGIIfY#e6WH(+-RitWlDf5 z3fz`Rsu?W?(J=JlqAe72>q)IojTN76rB6K()ktY^fy@%c^_ZGb`qX$>Q;JKr(IuNA zN=nJxuf`)L@_C`A%0VG7gEUxZ3IXOr%maq+*TRC*9dwDaUr(BOpgyjk8sSV-i}wqN ze1**ZrCP==u!2%bQtK5Mm1rR~m{DW}fIZ+&_G!_6HKl4|xj;KS(ZHO*cxj@NjaeHK zieZ2&%Zl5nwj-j4i(0INs2*0L+K>_{u`!-!8&|bFpU=sVK2c~QU6Vf9AOn+4Fdv(& zf$_=7X4f@16FIWw={oYkq`%3KWtd8vf3Fw`HJM4O2|by@6XZambQk#{R!csd^m_2A z(;&O2>LB6ZR6Qg-HdPDbz{%R*@I+f#h77)^hMrD_)zWNrJ3I@PYbGEQ(?MAF;&d}eu1vS=<>YcsPHAwWhV;0}r*%qO9~*vhxb;Zx(b3k_ zqmPda9U2=k>u8*5;>~D3Qb!)1sfOhF8M;sNGmRT~az7crQ%&A|@AJnMzZF zqb3BGlzeUZ;K{$q!&l%k93OsUq<>`iz(^MEXy<=nOFLTIci+?A8RDOg?hcB)4|P9u zX!OYAV@3A6aEf+!?V|8CxCwLFBO`SDUQUujbZ~Wf@UP!G?mCFl&W|PO=(mz2OBDJH zzd4*=j3ZXIM*@I^W?RX*QQ>!A}j5|*DtieMZTKtk`tt1u1BsR z!*hT3HUP(kAwcBwzIrytx+Gornq-^?vi}udx5yb<&!KObbId$U(x3Pjtt&v@N$(`5 zpSdZwkuAaPWv(E3mSnwM)B%Qebin2|4j4ck)QcR81J3Db4V1as$q#LfWcIlr`RL5C zqUPaev)%!!i9tn8Hn-7a0BVXHizerwrph%>74`c5p7lOJ^)L*g9-G_fF#z>Mjzy1i zP;YRp#;NC@ENV8skoD3d;lePAnrv>P$pEU!=;T(1&%=gUf-0k^(sOpMsPMnDS?_VG zfFX|xY;L2#0IW*nSgPV2)XRfjkW`$TFY4Vqm-U{ddKk{29-G_fF#z>Mjzy1iQ18rI z7pq??6gA&{DeJvRH8CupCY#%6G5|G2jzyDmP;+5TvuyrsQS*19MrtAR_D!E7Pqz0 z%K&dr>34hp*T6si^#|`NHGtteG{ELI1{gpMbch^_0SvD~(!xRnPmV zSq$YiW*KT@Rs<|&MZjW~10_wYo^Y4bofAK_bEioAP;mLjg^hAc3w4O0*~TG5N#lhb z18m4R7EdBz@x*{9KtM`}d(=#xzYvt0iL&T_=0BC>%M0Bt?bHQ^HX9cVCCY0%2H4QX zg$P(&FkrolHuA=6JK@zr7x9)J>Hx!D8wU)f4i2%QjRO&|IAFkf2YczZP}$$+qz$>@ z2S-OT;eM9b{2q4iHM?~0Vs}f7k}(X}cw{JgWJ4Q|B4F{zfb|{+)_Y8`-+pTc)ja?n z14O_0rhJ`vmuev1xpb%h`h7j{Q%jP{k8Yrm4v*3N&gy>#gm}t4rf;Ti2mEG7Nuou3p?oUi@tH{{b+2HcbYM6ggGy0+u)07G_nmf2mjre@t*G%CuvU3?|d z@;0_UueFsbK`X^jc^E!5ZG9wKshGyZG^tH&tDkC<(vmbWO>FEv_ukzZVB8NU|C#@} z=XcKBdF;^D_={KLNBKzNF0Lj1d?r6yXxQq9TbC@WI6=u*!vfU}7X(d(1knq*qYExW{kP%XOclAtbG2utQU1fLM77u}Ai zb8WwQ5jaWIk?^`G2V0bb+pU-E8cqtVFx1FOvd3czI6f7wMJ0t{F>`XoAQVbp<2>3MeBIQYQLg6OWSh$U4mB< z-9C*&x5F;@#AEQ%*r&@MXyGq-~_3(l-9QLR}!!WzJuZPhZnVFM>pdp*5<7CD@YZiKr@@O*NumX9>@=n~ zg?9uaRl!Y>rtrRKsg903T&lk#AD6n-@eCDG^b!R2kdpn`!Q=NHc)^d^; z8m^K=r^Cw{Mt3{S3z==KlAJzKi8{|Z%W#phu3TIMwqQ>eY{7?J02u1Z#(JX5g!Q%k zrZ|IgqC1o79D~AhutoF9i$xKgf)76cab( zAvn#%D$Enf8&C*Hj%anHD7dAerXl!lLm0nv4L4EB zAye7+_|3Yhsj+#-PSyDi-_n)krI0j%-(!(*a|7sG5sohgaeHjTp~-m5Hi9wy#BqBj zIgaPR`h|QM3=h$kBOdGTcrm`sMKES2x4_8<=>8Fre~5CAy3LREvf$i5sQai5C*3^i zG*3N0>D6P9wDp*rfw4xr?DV_bG`l6tts?hU@tg$o=dp5LMoW&r$!DR>$M@NCaZUmW zW-`vSFB~;;sUd4VYs^5$&!!t`1yt7`lkO8)ycu2hFGD9!Jm8B^nq_HR!eZ2e!nW4| zM?$dK2T2Wr zWD<}}0`gvL%156MEi8h6&E)OKtz-hf6E0j>YnuW-36nZ}>gw>RLHJB!zKNw{0{rdZ z-j1Rs$@^%qf2TUT@I^Q&4ksBQBs@iR7t<@~@oXB&F~(6t`v;#HXxCtRRKn~}+3ao4 znfu9roU{PgB%}~FJ=S4sjcIIZ0K16g%$(bp0vAC0gIN!wlJ%Cce=pAElM0{-60Fb! zl?AAGXvxwKIQXQoGdh#gr9d}PNv^m@^O-PO(b+)@Z$W} XIlVk%*69ehg8X~9J3JTl{hItg%bNTD diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jrxml index ced81dc4e..964072056 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jrxml @@ -652,7 +652,7 @@ - +