From d9537951b9d8be7479a882d5da43ccc8ae6162ee Mon Sep 17 00:00:00 2001 From: walace Date: Mon, 28 Dec 2020 19:31:10 +0000 Subject: [PATCH] fixes bug#20985 qua:debora dev: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@104869 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioResumoVendaOrgaoConcedente.java | 26 ++++++++++-------- ...esumoVendaOrgaoConcedente_pt_BR.properties | 2 +- ...RelatorioResumoVendaOrgaoConcedente.jasper | Bin 47401 -> 47417 bytes .../RelatorioResumoVendaOrgaoConcedente.jrxml | 6 ++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java index 5c7d73dff..f60c0226c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java @@ -21,6 +21,7 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioResumoVendaOrgaoConcedenteBean; import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; @@ -54,9 +55,8 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(3) THEN CAJA.IMPORTE END), 0) AS ANTT,"); sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(27) THEN CAJA.IMPORTE END), 0) AS AGERBA, "); sb.append(" COALESCE(SUM(CASE WHEN CAJA.FORMAPAGO IN(2) THEN CAJA.IMPORTE END), 0) AS CARTAO,"); - sb.append(" COALESCE(SUM(CASE WHEN CAJA.FORMAPAGO IN(1, 3) THEN CAJA.IMPORTE END), 0) AS AVISTA,"); - sb.append(" COALESCE(SUM(CAJA.IMPORTE - (CAJA.IMPORTE * COALESCE(CAJA.porcredbaseicms / 100,0))) , 0) AS VALORBASECALCULO, "); - sb.append(" SUM(CAJA.IMPORTE) AS ISENTO, "); + sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(27, 3) THEN CAJA.IMPORTE END), 0) AS VALORBASECALCULO, "); + sb.append(" COALESCE(SUM(CASE WHEN CAJA.INDTRIBTARIFA IN(1) THEN CAJA.IMPORTE END), 0) AS ISENTO, "); sb.append(" CAJA.NOMECLASSE AS NOMECLASSE, "); sb.append(" CAJA.NOMEESTADO AS NOMEESTADO "); sb.append("FROM "); @@ -67,20 +67,19 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { sb.append(" FP.FORMAPAGO_ID AS FORMAPAGO,"); sb.append(" EI.porcredbaseicms,"); sb.append(" EST.NOMBESTADO AS NOMEESTADO, "); - sb.append(" CS.DESCCLASE AS NOMECLASSE "); + sb.append(" CS.DESCCLASE AS NOMECLASSE, "); + sb.append(" R.INDTRIBTARIFA AS INDTRIBTARIFA "); sb.append(" "); sb.append(" FROM CAJA C"); sb.append(" INNER JOIN CAJA_FORMAPAGO CFP ON (C.CAJA_ID = CFP.CAJA_ID AND CFP.ACTIVO = 1)"); sb.append(" INNER JOIN FORMA_PAGO FP ON (FP.FORMAPAGO_ID = CFP.FORMAPAGO_ID)"); - sb.append(" INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID"); - sb.append(" INNER JOIN MARCA M ON M.MARCA_ID = C.MARCA_ID"); + sb.append(" INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID and pv.activo = 1"); sb.append(" INNER JOIN RUTA R ON (C.RUTA_ID = R.RUTA_ID)"); sb.append(" INNER JOIN ORGAO_CONCEDENTE OC ON (R.ORGAOCONCEDENTE_ID = OC.ORGAOCONCEDENTE_ID)"); - sb.append(" INNER JOIN empresa_imposto ei on ei.empresa_id = c.empresacorrida_id"); - sb.append(" "); sb.append(" INNER JOIN PARADA ORI ON C.ORIGEN_ID = ORI.PARADA_ID"); sb.append(" INNER JOIN CIUDAD CO ON CO.CIUDAD_ID = ORI.CIUDAD_ID"); - sb.append(" INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID "); + sb.append(" INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID and EST.activo = 1"); + sb.append(" INNER JOIN empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = EST.ESTADO_ID and ei.activo = 1"); sb.append(" INNER JOIN CLASE_SERVICIO CS ON (C.CLASESERVICIO_ID = CS.CLASESERVICIO_ID ) "); sb.append(" WHERE C.ACTIVO = 1"); sb.append(" and C.FECHORVENTA >= :DATA_INICIAL "); @@ -95,7 +94,7 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { sb.append(" and EST.estado_id in (" + parametros.get("ESTADOS_ID").toString() + ")"); } if (parametros.get("EMPRESA_ID") != null && !parametros.get("EMPRESA_ID").equals("-1")) { - sb.append(" and M.EMPRESA_ID IN (" + parametros.get("EMPRESA_ID").toString() + ")"); + sb.append(" and C.EMPRESACORRIDA_ID IN (" + parametros.get("EMPRESA_ID").toString() + ")"); } if (parametros.get("CLASESERVICIO_ID") != null && !parametros.get("CLASESERVICIO_ID").toString().equals("-1")) { sb.append(" AND C.CLASESERVICIO_ID = " + parametros.get("CLASESERVICIO_ID").toString() + " "); @@ -118,15 +117,18 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { df.setMaximumFractionDigits(2); df.setRoundingMode(RoundingMode.DOWN); + BigDecimal aVISTA = BigDecimal.ZERO; + while (rset.next()) { RelatorioResumoVendaOrgaoConcedenteBean bean = new RelatorioResumoVendaOrgaoConcedenteBean(); - + aVISTA = BigDecimal.ZERO; bean.setAgencia(StringUtils.defaultString(rset.getString("PONTOVENTA"))); bean.setANTT(getValor("ANTT", rset)); bean.setAGERBA(getValor("AGERBA", rset)); bean.setCartao(getValor("CARTAO", rset)); - bean.setAVista(getValor("AVISTA", rset)); + aVISTA = MoneyHelper.somar(bean.getANTT(), bean.getAGERBA()).subtract(bean.getCartao()); + bean.setAVista(aVISTA); bean.setIsento(getValor("ISENTO", rset)); bean.setValorBaseCalculo(getValor("VALORBASECALCULO", rset)); bean.setNomeEstado(StringUtils.defaultString(rset.getString("NOMEESTADO"))); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoVendaOrgaoConcedente_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoVendaOrgaoConcedente_pt_BR.properties index 84c1644ce..884b0fbf2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoVendaOrgaoConcedente_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoVendaOrgaoConcedente_pt_BR.properties @@ -21,6 +21,6 @@ label.avista= label.isento=Isento label.valorBaseCalculo=Valor Base Cálculo label.total=Total -label.nomeEstado=Estado: +label.nomeEstado=Estado label.nomeClasse=Classe label.totalGeral=Total Geral diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper index 893cdb3d9b62046511e28d2feb72b22bbb77afad..9f06ebfc984effd4b5b0e94a2c7f16e15f0edb8b 100644 GIT binary patch delta 5492 zcmbW5ZERE58OQH+OiT#N3(oSMIxh~O03mN~5-1SkIExd%)i@!fY0XVAB*BRt?1b=U z8kSNhs|GohI&G5{ZA@wrDrEUEm7xwkOxmPwsx%c%YS(R_rfLYHZXecG(4FUbj^FB= zNhBX0{g408J^$Z1*Vo6+yI*MD|3Y*7zgyVOnk~Pm*;>TjeQgJGzP_Gy?mK#ZVM>b1 zSgwY`Tua9!>33Zr{uehE$ndXbjIU+{R17{b#sn!MBPw5IOP6;nAL{sxHuq*IB5BP| zuNPY6TkM{-G9O;cG=IC>#t0T&Zh!RY^S_Zv&GfE(MV!smhTa>`abRfx>Z?b<_ z^?Y83vz+D~3;QP{NgX1se=HnP67zl+=G`zEobX!$N;vEnj>B2B{Ijm}GM~`UZIU0b zzV7O>TYOy+={w`fj8Z=x84J`q6k0L&7rJY7oGk%6{zQvPx?n9W5LOk z`SZl(4)Xw?qR$zRShQ7e&JSz`zNXJ?Ed~)6>px)e*xX*bHQwLYvzzx%^px`cOFiXW z|FWls>p%1uxqj4B!S%-8=eXY1Tg|nzch`C`r=H1g>UFWT-RQ02O&|7d;Z6VP-OhED zy-IA>4&1CzZzel#&*#oLJ52i%dnMO*?ZpkWr8$W$xAWVVvfj)to84>m#KH{S)oimv z&oAHQfR)1dERL@_sthz;K28@yqmYqbnlG4g3+)I3m)f=K8kw)|Td$rUv?JZUx7= z>~l|R%OBySnjuL#`ACvv39MoKY|!}Giq~Bo;7_cZKc4Wwe!Dpe-3lA-v&w$X+CC(k`)>JzleG^-JyynE0-&4AjV~5c>{oB460vBkf<*>m2?>SC_Jh5nFZ}1Yt2@5RFxW$iN^Wc~FUH=luBK1!F5Q zu@`qWvautcXWf9@P$B!~h)LeerY4`ywgDX$3)0b8g^moQ6B4$8WMUgEN!!qJ)Vmh8 z50A#!hJX!AKeEwSg^dhk6B5`+CfNGpYz1uPSY$11?~KOS;2ocVWgOXPtinbHvIz-n zBol1oDQx-duVczu_%4jc_~wBROBDFlp=48g^*VZW9*L+6pEHsPqG+6`mi_wpF1eiT z9W7=X0y%5p8VUrm-v%Nq*Ko&Ztg>TdAfJ%1V(G8yrxU*x^uP_9wuK~qiC!WMFvI*2~nawE$S;CWmpc+)XJtjo}k5&OVcL*6eJ@rDNh`?e>_>1 zNmsI}^LiIaYD+%N#r1fSypZ&}P@4FHHmww<#@f+L9ISuU5ncZ?HeqHH2Ycs-$uEo-&LQ5`NI!i~t z)&_7*^eVNdzzKt+AYeSWiz(HWZ0EUA9t_`Te|2uF>}8*vGx2eLbiaI%d844gyB_T@ z!cnfpGN=MYEo(&O1Y>zmC74_c77~IDk4X!f<6nw#31 jb&@Pg+u78*a+doe-SVebbUO;tnj%sY{-;X+e&PQBFtY|i delta 5533 zcmbW5ZERE58OQH+(l`*75KQyp1e_N~yp@oIIAjEbonRIxjvXZq5MB~)69cA~*uf4- zpb4;)LPx7MJknI8R;=X{LItF35{yk-CQXy3YAaKbwyE3tX+ok!TR*KGl%3~!j_sTJ zG70kG;eY&p&iVh&xxTqK-2TdP^()KG|Ez-d^~K<-uDs${T@1I*7r^O*i(%kgE`+un z%$prmrd29$L%qwE!(-4|Yz~&Oxad%hD9Uel#KcdkeHQN4+e&4RFsLn>Y5ys~t;3^x7_sH!S=Q+pDeY*Fn9t9NfMoYvXOv zkwkbRL5HH=Q&pPY;py%6_6+uTyMsL;wywiUU*mvmC}d}_Ef@%R+d{rzKsHgjjnd2+__{-WZ>rzZ z(IWb%I_#qV-Hvjhf7Veg^j|uhLVw$_Lg@0&l|r|4RtY`Oxj9#^X@kPIY}Vx7e%@Ir znm+4XC7QDRF9}`muat+io(}7DXAYe77YgSsKQ4RCUm^6z{*pRA(){$1`^Dv3u-}{= zK7YvDlMLI?UIk5EHZi@U3wMg+H);Hnu1W_lS4hk0+Q^~W)@W1@YsnLY&$~*+ob>^F z={;4!tF?H$C*&F2;R|^D$pqmRN!RM_>hAIOdXkp-?xiM5YtXkn>GB1*8CWhNL}zLd z+(1vTH`ykv61o1Okgq#9hzLoO*YE`^8B=WY^&oCjK#4jZ{E;(|P}Dkci&^{$W!c8s z=I?K6+}PMq$3Gi4q0==N?H{XQUhl-*qXo)X0{xf{Bue<6Mal>|tyHk9i zez$iTyAHsyKCe0qxB3Eh-K-0n#-U>8R?#%D)9*|?wFz%KWkOMu95@rTfupZ%8H32* zC}>%wRSXaNtgvm@GN&NSX$$)Mx&oOCD~eH}h_mCF~hCKd3u>tWF#tVXZC2(@@KJ`!V=e=(ApP+5A zL2b+m8~1fZA7BfW`}Flt4jF#sv+;n9@Y4+ALt?=UJ#z-kR}@<;_vta=+F!3aEKeq4 z;#w$Vwi=+@(At@*&IC1B%_|JT+kx69PWX; z;gtO2U|4+wt^@y2ze%0K25q%k4!gCw+QyvPITWX;2@X+(X-8!6v ziy|DA2*L5#1da`YlM>;iOv6PCa9>8W=YhL;BndZza8#xUj>jf&Y!IB32q$G4Zpv_3 zfA`8}wG0A>OTez@KM$s^>v=y$Kq~JLAdgJ|*&skE5m3rB;5!Du4~{koz`w^!;9p0d z3$S%$EbkfuQn^BaJT?Jjg8-#OKq=FJR}6rsqodD$Zk_5?x?_KZU{r1s7>`ZB*dQ<| z5lqT7*lh#YkauQNOwoQbvKnChx)mSjD|XetjVn#U&5Y*4h6BDz$zXZ-GcfR93O zj_om|UK;b|J;FFDUsD{9P2$*~I4Lnswr9kBE#e$=GskOGSAj^#rjpOg8lU`Z6d3a4 z^Z0M$WjQ<(>QC8%EV<42xR>+kIkUy^8jzhYknlzOg@pF99_ES32T^uD%ucRVAH#)- zt*&y!qhdF~V>c78_C#3@dx*Ei*tP(VjZ8c{(&0;0mIaPZR;zYN^oz-@u60O6WsM0D zyXHjfAyJF5Z2=J*nM7-l2$O5z{S$U|4FWAny{U+i9X>f>h0mv#yPC0$N|Om7yXJuG zA>dA9+X6r~G69=XfC(j+uIgZj{{~W07q&@oI^f%rEoz&1@3KSaRi6`|_1RRsCbaCr z{Hy#@kll`O4g4v$FMyMVKq0_Xuvfg=RKT{W!xYS~y}y}St@gr$DVO-Ha=KOB3B%K< zldr`;opw9%S)Wa%-vo|bf|C;ASen2|BLl9V?)@vLbVK;s({5)3!>JrH31^qWrNnTS zCgIY^2tP#OrDsMA;UAuHJI67c%9u$wyA&=ZhO;yYmqteT7=_RN&=_u?aXZgqIF%Wb zaCRwNN(^Ud5-yF5@EHnU^xA}B=kLAdb^?Y|nKcP#m%^pQaF!AVL=SHlBLSe^faMoz?7?kr{6kM!I-ZLa - + @@ -235,7 +235,7 @@ - + @@ -307,7 +307,7 @@ - +