From 4fe4db191d7170c34949c2f0f93031f2318bba7d Mon Sep 17 00:00:00 2001 From: walace Date: Tue, 27 Mar 2018 20:52:53 +0000 Subject: [PATCH] =?UTF-8?q?Feito=20o=20agrupamento=20dos=20bilhetes=20conf?= =?UTF-8?q?orme=20solicita=C3=A7=C3=A3o=20da=20qualidade.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bug#10771 dev:bruno qua:renato git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@80305 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioBilhetesVendidosNovoLayout.java | 31 +++++++++++------- ...RelatorioBilhetesVendidosNovoLayout.jasper | Bin 40884 -> 40898 bytes .../RelatorioBilhetesVendidosNovoLayout.jrxml | 18 +++++----- ...latorioBilhetesVendidosNovoLayoutBean.java | 28 ++++++++-------- 4 files changed, 43 insertions(+), 34 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java index 6556f5078..ad7dc867d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java @@ -3,10 +3,10 @@ */ package com.rjconsultores.ventaboletos.relatorios.impl; +import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.Connection; import java.sql.ResultSet; -import java.sql.Timestamp; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Date; @@ -47,16 +47,16 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append("select t.cveestado,"); - sql.append(" t.datavenda,"); + sql.append(" to_char(t.dataVenda, 'dd/MM/yy') as dataVenda, "); sql.append(" t.statuspassagem,"); sql.append(" t.especie,"); sql.append(" t.forminicial,"); sql.append(" t.formfinal,"); sql.append(" t.serie,"); - sql.append(" t.preciopagado as valorcontabil,"); - sql.append(" t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))as valorbasecalculo,"); + sql.append(" sum(t.preciopagado) AS valorcontabil,"); + sql.append(" sum(t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0)))AS valorbasecalculo,"); sql.append(" t.valoraliquiotaicms,"); - sql.append(" ((t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))) * t.icms) / 100 as valoricms "); + sql.append(" sum( ((t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))) * t.icms) / 100) AS valoricms "); sql.append("from"); sql.append(" (select distinct est.icms,"); sql.append(" est.cveestado as cveestado,"); @@ -107,7 +107,16 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { } } sql.append(") t "); - sql.append("order by t.cveestado, t.datavenda "); + sql.append("group by "); + sql.append("t.cveestado, "); + sql.append("to_char(t.dataVenda, 'dd/MM/yy'), "); + sql.append("t.statuspassagem, "); + sql.append("t.especie, "); + sql.append("t.forminicial, "); + sql.append("t.formfinal, "); + sql.append("t.serie, "); + sql.append("t.valoraliquiotaicms "); + sql.append("order by t.cveestado, to_char(t.dataVenda, 'dd/MM/yy') "); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); @@ -139,14 +148,14 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { if (rset.getString("statuspassagem") != null) { dataResult.put("statuspassagem", IndStatusBoleto.valueOf(rset.getString("statuspassagem")).getValue()); } - bean.setDataVenda(rset.getTimestamp("datavenda") != null ? DateUtil.getStringDate(rset.getTimestamp("datavenda"), "dd/MM/yyyy HH:mm") : ""); + bean.setDataVenda(rset.getString("datavenda") != null ? DateUtil.changeFormatStringDate(rset.getString("datavenda"),"dd/MM/yy", "dd/MM/yyyy") : ""); bean.setFormInicial((String) (rset.getObject("formInicial") == null ? "" : rset.getObject("formInicial"))); bean.setFormFinal((String) (rset.getObject("formfinal") == null ? "" : rset.getObject("formfinal"))); bean.setSerie((String) (rset.getObject("serie") == null ? "" : rset.getObject("serie"))); - bean.setValorContabil(rset.getObject("valorcontabil") == null ? "" : df.format(rset.getFloat("valorcontabil"))); - bean.setValorBaseCalculo(rset.getObject("valorbasecalculo") == null ? "" : df.format(rset.getFloat("valorbasecalculo"))); - bean.setValorAliquiotaICMS(rset.getObject("valoraliquiotaicms") == null ? "" : df.format(rset.getFloat("valoraliquiotaicms"))); - bean.setValorICMS(rset.getObject("valoricms") == null ? "" : df.format(rset.getDouble("valoricms"))); + bean.setValorContabil((BigDecimal) (rset.getObject("valorcontabil") == null ? "" : rset.getObject("valorcontabil"))); + bean.setValorBaseCalculo((BigDecimal) (rset.getObject("valorbasecalculo") == null ? "" : rset.getObject("valorbasecalculo"))); + bean.setValorAliquiotaICMS((BigDecimal) (rset.getObject("valoraliquiotaicms") == null ? "" : rset.getObject("valoraliquiotaicms"))); + bean.setValorICMS((BigDecimal) (rset.getObject("valoricms") == null ? "" : rset.getObject("valoricms"))); bean.setUf((String) (rset.getObject("cveestado") == null ? "" : rset.getObject("cveestado"))); bean.setStatusPassagem((String) (rset.getObject("statuspassagem") != null && rset.getObject("statuspassagem").equals("V") ? "N" : rset.getString("statuspassagem"))); bean.setEspecie((String) (rset.getObject("especie") == null ? "" : rset.getObject("especie"))); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper index b160e25198d55f82e61c567fed8dd9f62d280448..f397c0c6aa473febd00653fa9c1601da4958ba5a 100644 GIT binary patch delta 4173 zcma)5W3uy`qH zGw8Xem)bRXbBCdluSVl+Sc*u}+ukVq(XRB-JKM{Mmu{{z&=+=@==RpP0R+^cQPu9{ssI3tTMEBbR&R3JF{;vv9=>aG%$>J9qw2ehIi( z=8?-ia)ksgmsz-C2DtNrdw~AlQcnNA>q+@FU}L$AZ0?aQB(S;6!WJ{YzO3!JZcih5 zmEN(G(b%5T@{b__%XLiP9utIw1TM2Ah#5$@t|ffmW)%s4vz?Z2K?0U{F@bwb5E2r& z%#t8xAmQC~LTa1+Vou3N(S#%qM`9sII4~GcgZP(qm)_Y|Q4FoM(ApaauWl4T>4;fxmF}Y`z1e06bBuT;|AqS}a9t5z zXA1^KlYvM=b=bQ-pEtS|NB`G^E;+oiU4C;zYC`q-!$ayyqX=?y{qd-OaP{qNgyk>9 z6KWzEcd7BXI^qwlT*PUEk)geT_~5FeDoxoROA>OIUUXH{-yJXz6TN?+y8JG?Q+6oF z)hE=3WFio3=vJe6(>fEaR~};XE@cOsJ*OCR`D`sMG;gBsD}`)zNingBe=3zsS9EV; zx`R~{{YrP`s%aDbPIm!Yy@C_(cR$*0A_QZ5yIjs*Z@=QS+mtST);y$OWkX7Y-G)EC zr`-RboZ&z=+bJ5kZ zS#*lT9s3-;-h(#9acK2aH7#))(mNWRDA9JLxZzNbySK1iyx=x&G!Y4oFTc~~wXt3F z*pze>>#|K?SMPOr4=T=d=gz+JQk`h!c6GaYyF9j4Jso@Awq64Z`1GL1)n#|29}V=3 zX-K};;d1sXj-LIW<@}}>j&9al3D61;?3$Ui=?jhY_DQ35Z({7S2aZ^nd!DKlv&~z% zV#3~PG_0Sx=DkS9udri?vNvGAUmfzt*e8?j2kc!nH#AwATP#iHw(U*Ltyc5)X6U?@ zkk$=Gg2_;LWqKhY-p^;P|=LZ6Dqr24Qw(GVX_E&8T% zDy(>rx_2b$9XzXg2rcu$6)b2x^%c}{UU$$q^BfF z%AxKN1AVT~M2{XRH2ylD64*eu*q|=Yv10@w>M>2u4j4A_ z0r*w}pGr~;6fpGEt!|?y`!k<2>$eW;n#fWh35iTUag#f|$$%g=s#fNzA z5ica*g#d3E^E+oE*2rfS`qV-SU97^AqyC?O$ANQmMxGin&4 zK0G!eq7DXXNs^8QT7>^az(gwW@V*L>SWaOi_ZTT8L<$L!TxLd|Vqa6L=>5?``p$8W zh_ReV$IL(smT8RP9%F=r7$G5s%gmT*ytA6%kcfCWn2wl(2rLvMxW@<~Awo!q;4(9U zV#Hi%;DIt|(uJB5S`>yDbGTl98Dg+p!Wix`Mo5SelEtLu*DZoz-fF48CX8R4DK;QNXQTpGPuml_y7-GpZKKwV?`>0?|E^5!X61l z13`Z$b1a8^Obe4+jMsMWVW0exwC-dcs|6rW#aUZ-jk=Px57y=0`uFvpu*C*)j!2Ev z{bgfWzq!R?F}Jo@o7-Eht^LjBHfu|Ju0-hWsfSaylYND?#qd?CF{CDrHGU~D(#gI{ zhSXp#87ESHC_d5&^yE2yw-b)xo>Md5hf`8toJQ#(#_mi&Dohdqq!F5 zE-|;22X19{R%>o#Zbox*oqTyq&Hv{BZqHAW%IDaV(n%yC NZOHnN==e)5{{?TOX-ohB delta 4677 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 - + @@ -32,10 +32,10 @@ - - - - + + + + @@ -239,7 +239,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -267,14 +267,14 @@ - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java index a066f3d98..d237f7118 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java @@ -1,6 +1,6 @@ package com.rjconsultores.ventaboletos.relatorios.utilitarios; -import java.util.Date; +import java.math.BigDecimal; public class RelatorioBilhetesVendidosNovoLayoutBean { @@ -9,10 +9,10 @@ public class RelatorioBilhetesVendidosNovoLayoutBean { private String formFinal; private String serie; private String subSerie; - private String valorContabil; - private String valorBaseCalculo; - private String valorAliquiotaICMS; - private String valorICMS; + private BigDecimal valorContabil; + private BigDecimal valorBaseCalculo; + private BigDecimal valorAliquiotaICMS; + private BigDecimal valorICMS; private String uf; private String especie; private Integer estadoId; @@ -20,7 +20,7 @@ public class RelatorioBilhetesVendidosNovoLayoutBean { private String bilhete; private String dataVenda; private String codFiscal; - + public String getCodFiscal() { return codFiscal; } @@ -69,35 +69,35 @@ public class RelatorioBilhetesVendidosNovoLayoutBean { this.subSerie = subSerie; } - public String getValorContabil() { + public BigDecimal getValorContabil() { return valorContabil; } - public void setValorContabil(String valorContabil) { + public void setValorContabil(BigDecimal valorContabil) { this.valorContabil = valorContabil; } - public String getValorBaseCalculo() { + public BigDecimal getValorBaseCalculo() { return valorBaseCalculo; } - public void setValorBaseCalculo(String valorBaseCalculo) { + public void setValorBaseCalculo(BigDecimal valorBaseCalculo) { this.valorBaseCalculo = valorBaseCalculo; } - public String getValorAliquiotaICMS() { + public BigDecimal getValorAliquiotaICMS() { return valorAliquiotaICMS; } - public void setValorAliquiotaICMS(String valorAliquiotaICMS) { + public void setValorAliquiotaICMS(BigDecimal valorAliquiotaICMS) { this.valorAliquiotaICMS = valorAliquiotaICMS; } - public String getValorICMS() { + public BigDecimal getValorICMS() { return valorICMS; } - public void setValorICMS(String valorICMS) { + public void setValorICMS(BigDecimal valorICMS) { this.valorICMS = valorICMS; }