From 1f1b5a644bed32e3937b31ab36de63831cfb4606 Mon Sep 17 00:00:00 2001 From: walace Date: Thu, 18 Mar 2021 20:12:57 +0000 Subject: [PATCH] fixes bug#21486 qua: juilane dev: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1º Coluna agencia: Todas os Pontos de vendas. 2º Coluna Antt : Venda interestadual com valores digitado do total vendas de cada agencia sem os cancelamentos,devoluções, anulações e trocas. 3º Coluna Agerba : Venda intermunicipal com valores digitado do total vendas de cada agencia sem os cancelamentos,devoluções, anulações e trocas. 4º Coluna Cartão: Apenas valores de passagens. 5º Coluna Avista: É a soma da coluna 2 + 3 – 4. 6º Colunas base de calculo: É a soma da coluna 2 +3. git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@105825 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioResumoVendaOrgaoConcedente.java | 7 ++----- ...RelatorioResumoVendaOrgaoConcedente.jasper | Bin 45072 -> 44157 bytes .../RelatorioResumoVendaOrgaoConcedente.jrxml | 13 +------------ 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java index e3467476a..1e249745c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java @@ -54,7 +54,7 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { sb.append(" BOLETO.PONTOVENTA,"); sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(3) THEN BOLETO.IMPORTE END), 0) AS ANTT,"); sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(27) THEN BOLETO.IMPORTE END), 0) AS AGERBA, "); - sb.append(" COALESCE(SUM(CASE WHEN BOLETO.FORMAPAGO IN(2) THEN BOLETO.IMPORTE END), 0) AS CARTAO,"); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.FORMAPAGO IN(2,10) THEN BOLETO.IMPORTE END), 0) AS CARTAO,"); sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(27, 3) THEN BOLETO.IMPORTE END), 0) AS VALORBASECALCULO, "); sb.append(" COALESCE(SUM(CASE WHEN BOLETO.INDTRIBTARIFA IN(1) THEN BOLETO.IMPORTE END), 0) AS ISENTO, "); sb.append(" BOLETO.NOMEESTADO AS NOMEESTADO "); @@ -62,7 +62,7 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { sb.append(" (SELECT PV.NOMBPUNTOVENTA AS PONTOVENTA,"); sb.append(" OC.DESCORGAO AS ORGAO,"); sb.append(" OC.ORGAOCONCEDENTE_ID AS ORGAOCONCEDENTEID,"); - sb.append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL AND C.INDSTATUSBOLETO not IN ('T') THEN CFP.IMPORTE ELSE 0 END AS IMPORTE, "); + sb.append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL THEN CFP.IMPORTE ELSE 0 END AS IMPORTE, "); sb.append(" FP.FORMAPAGO_ID AS FORMAPAGO,"); sb.append(" EI.porcredbaseicms,"); sb.append(" EST_PUNTOVENTA.NOMBESTADO AS NOMEESTADO, "); @@ -130,9 +130,6 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { bean.setAGERBA(getValor("AGERBA", rset)); bean.setCartao(getValor("CARTAO", rset)); aVISTA = MoneyHelper.somar(bean.getANTT(), bean.getAGERBA()).subtract(bean.getCartao()); - if(MoneyHelper.isIgual(aVISTA, BigDecimal.ZERO)) { - continue; - } bean.setAVista(aVISTA); bean.setValorBaseCalculo(getValor("VALORBASECALCULO", rset)); bean.setNomeEstado(StringUtils.defaultString(rset.getString("NOMEESTADO"))); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper index 56a151beccda8f75399632b3d56582f26c5508be..e2756555c90fc6f6c0915a008a8fa9084988b030 100644 GIT binary patch delta 4076 zcmeH~eN>k98OML$??s6(IDDba5VWQSLMDNLF0(Z9Wnwy-&FM5sOC9-AP844r-^bLp z=946iHJv1zZYKtTnW1d0iMXv)wAzN@+Djz4tto1&?ECQCKG1gD**UAzKf(Dv&-MLX zzx#LJ_jS(oIoI<@1K)dvrQ63`Vd=@~i~OB$PAES-W=<#nwJW=qXWg|wwq1B`m~$@N zUplo{dHTX9+m|0)m5Gj4`~I{0v_1f<{nxBXh)f+gc+jAv8`INLr=<)|OG_!AvL>-h z=ME1%bpL=kb8pLDkR6U(|4%l@M&u!(gFA~Q9nc<2{4a0rAMVqN%!=~%1Y zNIK8T_M+dUu-%ByEMY^NxGog?N>~#x7Tok)C{e=FHtWT0*0;1--`M|Yx2_V`SK|iV zV!7O!keesBBINFoTN-kA%H;=K_m&H9mt7u8ru%1Xy~T&-{@svTi6NOKIHmBWVA!Co z3o9|S8pD)0qQtGi!~rE1v?N9-u}5xP$nDa$jNrDd3P%RR&3iFo(r%2>_Vs%)W|A^v zm3ao^cO%RH(vD94f!ktmhkx9*{=Pm+-WR;AhmPJ@iGkJVrz<-uF*BHO3TL;3?ySO` zVECrOIl=HXh4X@8ox%r$;X#FZaJ{G7r=vqfa;0)!Iekk0P&QO+_o!T`x^A6ZUP}R0 z6}L#PrMiLQy4iB;L%Auso9Y+1+XN*FT3#fuZG_z8AvZ{FOUPa4lPwC_Kn0!%xj+RL z1x`#XRiD6Z*T*I|UGXkQ_fuErex@!ea}BOiowVCExxMP9=iGT$t&aLR!rTk$s$U_} z)vB`&p{ILM-SraUT%9`X7*gD;@C|dn!*F*(t@awmyVuojf5KGvhFY!>IqogB-D%{x zx7B+8M7}$x_B)SS_pVy-Jsbm25268A;uPB9G&-Ugop1q>3_};TLlnE>Dn{XI#vq!# z(Tj2D%>?veGWs$V@oH1_=X?xcA#Pw1l39!tmLQ#F7|aR`Wfg8_HHNbWBX|fSc@(2~ z9Al|R=1ELoBfi8YOyn8d#dDa-4=mti^L3z#(frx*%ptlTO#IK8s^y$EU*lG z!$x8BV#`9FO~i7`hR>#BwdG)q%|*WD;aj#04_iLIZ5y!33gEXwJZ8n%VkIcDGJM}E zu+6IQV-akzzst^UpF;1WfZoy%LCi-8!|Nb2@SmsaK*7LH2)T4b|gbWt#5+MVw4I#ax zM@Y|kgp_MTNH6CR(#!oPAp%a%Yw-^9@xG3}h*}zsh=Io#j(WC710!&XopD+`Y-TrH z;Aa`e&#@hQvMXa4#cT9=Eqk*c<9Hnt^qGTcn>e~UL)_f2+p)f=2$cz zuvpHwcs^)}Txe;`wIN($8C+_kIC_O;aivY-n`vMQE}kjpN*>d`(fLI#U=iI4%;hLB$JqnjZEHEt!O=R87s?h+wA>k-m(mn9_k zIC8J6<9=7qYS+MDx<nt0HiWvx5U-vWFQVVbuhSf_#R74+b%=*fBwZYL1OKO%{* zYgYTK2+21zpfzbAdkf?F4-H{&V=9|5O9NRB|Akz>s~Jl_-wc|ouD}7i61CO=N30`` z*=JC%L9M~M+jRS`<=7@&T3~thn6`gU*&^FuTeY&y3hhZNwjEYtJFU!iS%p1iRkmA%T&2;T b4hvk=w4~IefBz+(w!oh>F4q6fQ&)WevC2Sj delta 4679 zcmeI0c~n)`6~@oEH;N)oMG_>=f_0X`;EYoY#)w0zQA;8rRvdy1`UHu?Q`FQ9w#1vn z)EW#9u|^CUQf*MwRB17(OCwR^L`_mG*4UJYCblU39`E`f%b2ygR$Ttm$NDb&yL-QL z&pD6%Tjz1(Q^`Cp+c%6*gv_%VMRv(69+BvaFe@&|FK_&WeXYEG(!7i@K2}mp>%6|H zo9bJ$<~OwVP4=lj!x)KS%GX*quay-W?%kx|qfS?=g8iyytXYWRWy9aJl2Zo+#iy7> zUe%W=$#WQ+X~q;joXnRe5pR8*>Q~oYXbn#H3v-9=@`T&VU2m=)D(TiRQ>?glZLHC0 zO|8KbnngBAhg>1#SDEKk{mw^SqjK^M4S03ECUZFl`P;Re;AUGB zt9Cr{RqV)D!>3<*@tI+ZUFBBW9)8xBa{_|BTtm1oDc`duceZ*>cIaA@JN%wC*$K|i z6&cT(Qmo|U*4DadjoO6HbtUF=a;Pp@=;bgC#*H2~cw}tUu*U|E%-icsM1!0UZ|3i1 zO?ND}dM)X4|AW1I_YUb55fUB|+cP2}JiM2;0ZdmbrA`a$$V%_LwM(RF&}~~)4{0zy zv*t|eo|yDdoFlFt(yg3Ttr{*s7awyK3w=-@3$2r@I@epmJ2V-2^{oT-oUa%!qsHiY zL_hF0f1lw@T(2)|8HHpt$33V48uT^xY*8PH7_jlB~zp3+k=DD5d zwjVwCh}Cq^N1NLKJ^k!UQVz4`Lo(V^FVki^G=tg;w3kLU!4o5MVxZ zveiC9kU7G3JBkqV30v+s`kPa1yVDq9O4xdT#YFQ3+wX6PH)U+Wi*T6BY{P#d!+gzF zyn;;g4cqZs95a<{$s0HapcH~K)WsEe;~E;^CVT~GBED!Ujo~kWxKCQb87RScKsute zgrJRtBS`uoSR&C$Qqft`(Ot69LpCB@a?n$9(OdG-M+z`N3K1zq7$Qe8REiNLXE0n! zFj6icS}tO&l;bg}z~fSh2~vd^^~MwGgQwIVaT7@PG3wrUCT$l3YaaX~wNSYC9_Ak*KNI`@o`gsBUX_l%KF7cei^V&0Fy z$VJ~_r0r}*+RkR=qW#WloX%oA5AF^5Ql#@0_zSUj7zQ8n;BySV zI01j0L;%i^usDk#oJTi&h7fYG4=$iT{(&f5!U%kY@%R@eq5@NJ74f)^6#N?w^3sVa zWQby=cp+2j;fQc(X^7L(21}H$^Ez@0k|eDa8p_eq^T8iXna#Y4i zu}qXRGD%A0Nx2}C<)S<-sPnjo*JLtfQ1`Hg1C8eJ|~nknnlk`0i?`omsX_4&GV)=ufkUd($b2_m2|AZxVZkC9Npw=gvd1>5Whix`410;l^CJ?`l!G}t%E6Amxn$dq-X=4^BVJ9 z*8~~bjAuE2WNLF9(Lfy2RyeJ#agGPXQVl|xcElC!glpOjH?_M!!^Bs^rLp#sK@sgvDORoN0@`=6zjg>-uN{aLs za#W{EF)?^XXG)1C$^}i5i#kWjiNp$>CzYBmRk~2Ub&>jLhWhJL4bWd|dtE`o>Ps4` zE48P-tOIqG4$;>%T372B{jJ96TAi$K>I}`+1l^<#eM{5yZ4R+jmus$O>UOpCJ - +