From 9ecda39839377e7666d7cba2ecc03ddc58030052 Mon Sep 17 00:00:00 2001 From: fabio Date: Wed, 13 Nov 2019 14:08:00 +0000 Subject: [PATCH] fixes bug#16792 dev: Lucas Silverio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@98774 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioCorridas.java | 5 +- .../RelatorioCorridas_pt_BR.properties | 5 +- .../templates/RelatorioCorridas.jasper | Bin 41783 -> 44346 bytes .../templates/RelatorioCorridas.jrxml | 438 +++++++++++++----- .../utilitarios/RelatorioCorridasBean.java | 9 + 5 files changed, 344 insertions(+), 113 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCorridas.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCorridas.java index c4d4959a8..5afe5f028 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCorridas.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCorridas.java @@ -10,6 +10,7 @@ import java.util.Map; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; +import com.rjconsultores.ventaboletos.enums.IndStatusBoleto; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioCorridasBean; @@ -70,6 +71,7 @@ public class RelatorioCorridas extends Relatorio { corrida.setClaseServicio((String) rset.getObject("claseServicio")); corrida.setDataVenda((Date) rset.getObject("dataVenda")); corrida.setDataViaje((Date) rset.getObject("dataViaje")); + corrida.setStatus( IndStatusBoleto.getDescricao( rset.getString("status") )); BigDecimal tassas = BigDecimal.ZERO; tassas = tassas.add(corrida.getImporteOutros() != null ? corrida.getImporteOutros() : BigDecimal.ZERO); @@ -112,7 +114,8 @@ public class RelatorioCorridas extends Relatorio { sb.append(" b.importeseguro as importeSeguro, "); sb.append(" b.preciopagado as precioPagado, "); sb.append(" b.numkmviaje as numKmViaje, "); - sb.append(" cs.descclase as claseServicio "); + sb.append(" cs.descclase as claseServicio, "); + sb.append(" b.INDSTATUSBOLETO as status "); sb.append("from boleto b "); sb.append(" left join marca m on m.marca_id = b.marca_id "); sb.append(" left join empresa e on e.empresa_id = m.empresa_id "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCorridas_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCorridas_pt_BR.properties index 8acbe623e..1bc93c9fc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCorridas_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioCorridas_pt_BR.properties @@ -18,11 +18,12 @@ label.claseServicio=Classe label.origem=Origem label.destino=Destino label.numKmViaje=Distância -label.poltrona=Po. +label.poltrona=Pol. label.precioPagado=Tarifa label.precioTaxas=Taxas label.preco=Tarifa Total label.categoria=Tipo Pax label.dataVenda=Data Compra label.pontoVenda=Agência -label.nomeUsuario=Bilheteiro \ No newline at end of file +label.nomeUsuario=Bilheteiro +label.status=Situação \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jasper index ff27a5e9f053e9b1f5705bbd83ec297dcc81418a..d78adfda8969eff2d1e5998e71a546b54d15b4dd 100644 GIT binary patch literal 44346 zcmeHwcYstyws%$CfoY(LLogtM0upBkf+DC)guw|o0R-F~nwe&%p{IN7?t#Iq7*+wp zDhsA{)iviefN6Er)itcTuGwc|b%Sfbtov5q`<<%l8>VaS^nCKy`*z^gty^`fZq@mn zI&~`C>RUc$y^;wwAr?;MCs*gM2_@UYiA1<9o=7G0!?ET_ES$ec2G+s4p)mXTeqRR4U$D8A_m%)aBTcE6#+uTp21Jr|kyJFS)0DHm(eUb&Drgbw7f(dOF)$qO zMO2&2A=2D}Qum<;S;itnfT^kK1hPi)6GV`%YM)fREuGtd^)2C8Rh$s4+t3!SV0~AG z8rL=_z=oz28(RV17bI5~c;uo$$wdLNJ=O%=1}biqL=xdfDprck^i7z;n+j^$V|Iel zSbHn-395V)9|-;&J4`W2hOJ^P2p5164k}&ubyht6+NiCTofVl8L~Q_Xbq*xLXD|-VuK^$V0olfwzt}F zD#Zq>hS8piMA43@+yQDN?LbyGhzd3UjUz>Z*$m&>N?5BM>C~u75%rW+3oVJge%C-pTJ@`@cmJxzwuH+!tzf;A z1TCaue0Nfj1~)gUnx`zr3f3nTZf%Q(Qj|wQcX=p%Q>Rk^s9q^*wYo-m-iD=XHLLqt zE%h`=S+kBd#(rN0%{vqqS1LGXi@K{oQOj7)JrqJDLm5>1FK#>AG`XlZNwC2W^NVF+|xO5q1Q?H05rH%@_(xuoG-x7j-F6y}*Z9qMb`rv%Z zGQTj92yLKzJ5GCXze}DBU12d^&T^8G>+Pa$3y5fa+%k*yF(z%0h=S7WdzZ7hcx*BOG43_Rb zL}IEHk&o&`I9L)62G6GX6~$#>)P*}zWsz{y)m(=8H<$ja;_mse;A~vuE{7gh6v9)!uL&B*d*53(1)N(cq4K0-jry5(xUZ`FdPOL_Yt6)Pz zvBs8of@~_M5m7ydpg(qABL%Sg&Q6k{jpR8gsesvQtx`|LWNSgk20_!RK$mQ9yLN@L z_!&hXVG~df*C~1h%X391P<2>YP}MWLQ`HO8TwWZ~sZiIEc3w5%)nT;A#?J4nVEfoK zb@6yK6=~~Kq6+2|*sJ@}P(+eNXbo$nR&S3+Q!LM|nUHBX6hmS9Ix;{hNm0lU6kI>& zwuMrtZcIN8){mVEgeEwn2jZ+1h-zA-p~m|OG>oBDak40>3`1f6t0&mJ7%rsMS!jK# zK!%`J+Qu$&CmO8mZWSg8DYvOm|0-f}sHq7yx0g}nu~fJ@oIsX=)vzx~>NOwab1ifl zJ?HCq(s3y^*u`mSoFjQ2+DznlWD$xMMq$R2lGe4^%Mhg-z-(VVEPIND-h6cn=neSe z(I$GsWRxwEEXRu@jrzHNB)Pb0b!qFWa8pw_O*Bw8_{iFDT?;yo<`zvGq+nP#O{9f% zSieZJJ_a}-DYE)_g&Zn)_&tyY51HKVN5PuclpR=?OZgPVF*@tce5_D};AcNdqlZb9 z4Wwd_D@gM%3%ilB)cK@&M~bt(jdDeEfcQ(f&}GF?ClP8+gxXqCY@#nZi)yIROHwLt z8yFsIjFX7zoGGZxD^zN{XMi2xZbE$#>MhD(bQq~fW2UqZ&xp{4JGlG8Epg{5O9-{&Yc{xg(F~Qdub;{( zXST^X0R;!YeV347*=xtqpI`qMXwjZ<3k-&9D#o zHKvoh$FvgETG;xbZ9y$cbwe5FR%lUFLiK~$-6u+f#7-n{|cnY-!S$Wo`gU_j@U zl^@ekQ(942SH7gQp{^SL7wi0etzyzq`JL)!$bKJB)`b-nrL}bp)kTX+i|b%_tFeL{ zs}Khsyu|uud+V767$z-ZLD)sfRBfcWD3VGpV*Og<_ESgOZQl%Qyz|1h4|*iD^`-ld zS@2t89F-b>$abJJ1d+Y|8y`P)^_%l{e#9Y}FfS6ZD~q8DvrQ>ulK&>(Sfx(dG_~1pV75DNmYgi+3yzldTA= zs-u`p7`zI)rMp2Q(%ID11DZO1vIWA@v|NdL^AlhlD8G zQ8bEPBxh-n+~FvVGqar(R!no!a>vXe9Ht|yNm<&$Cta*+A}|Sq9h|73z5a zQOE$TOtP4bAlZ^hv?`IA%K2WZO93RKEsPoLtR(|AvZ=NHp(aF`l^t;^W8|r@ox`bd z`Dz_kFAu&~D4}wAue45;Zmp)*sCTC+q}EgKr&nh?uEDEov`F^s-Pz9s;1zXJrhD`P zOn~IX;;}GQ##g(#_-Na%&YSvTfWMk7AQFdi*#Bw-1C=6;e@{qf^Lz%YN0M{ zp$1_Y)*iB*`(!X%Tgo{@c6=DdYsw3@P_*U&UmRrS&y$i8E2 zIH2W}GZAUR6m?@udu%O?kZIk`Sva{AQxY(Cfb6^E%7JSDJj4mD35TL~jGW^e-VRZd zZ|Zt=&ov3F-qgD6`L`oST~jZ6LgFRrK08Y#*{ReH14I$aA&ytzrbn=%qpeqp4UL9Y zg`@egcq@a<1?-@kvt zs6Vz(ICMhAS8khu$jW4w51BdGuclIF3`2cYPmj>_E-tOAE3L6BB8yS3G+d=o2TBU* zv?{VXA2NfgROwa3G2JFz;YZ=9D&kE;nwPD1ZPFgfL{}b7j))s&F~SHO(N51T@NpTo z259$JXeYyob&o*U>Aog8AG(-}dl*qduOuf3$zwbr%=^LsycDE6bo@PM2N> z`l50cRYE!&{ZLV422|V;W>nl1W>hpq7pQD>s-t~=sO)7xC8$ur6jn2qv)q4@X_;*g zpg=oh3(D08KGnW{W$7V*dgjTm#?L5w>Boa|34tP=U-*Hd$PA#kBg~+22gZUX~JS;B$icE*&nE!lQk-vMqYc-UA-Ut%f|Cx|8~~asvTxjh|$N{ zb&=xW+gxs;1k$1^b^iw1+vip%AxthCr|2Tt96SKwd8!wbGIh^#5SV$VSHFhL`o2mPQ?WCm#55oT!I z6lQ2NMHkRK=wT&2_(8L;4>Zb>$V!*xW9fWU)~)8M<*yuY_B+MXR{vyrpJ&f2dBqHk zQ;+Uj%!>qzbe{KvMUfd`aYvY8aZ{LK(G*?4^1M?W?el|Wqyd(}j*(ZNY!4+OS?M$M zGS=f+BXj2dk*^NE^t>G-CjRF8$=A%k#|rXz9bxL%1WD61C;Gq19QjYzpuCyZnr=_TO^bd3%praFQ7pVs#G;0NxJ?loRm5Mw4Y?_ITC;9EvjENwS%Y)UjBggq zTv7DinBTSR{POMji9G|(bOJ{@`F`LiG6Oj72s1ct3NtvGq6={Hdj!rH12{u;kAqdr zNF2L-LQPp20|d`oS;KS7Re{4kTYYNvvdcfZ{13+-HD=GiQ$p}ar_c``MP`7<9btyY zO<{&dQ*;4OVUOTBzyOan)v$33@YIDmu=(Hp*G10*bS$hZW~tfksW@!&=*wO>XxW|O zmiEns#d`*wrG$=j>ip1AWCnEH5oUDU6lQcZMHlGQxj8BQRC8h*{xasz4m6e+!1DM+!SVPG({KK9N!~s#&wO2w4}2g;mpURKtkU z`tal9H?Mzn+qYGRn6-cggm^}o_)XaIn?RwQ>-{86kr^b-9buLGdXl zy;BkG^OLcII?I@qVgvTXx}qN-8=qc!^Hm#f*mT#(OMesmq4G{MAcR6s2GI`^DAKvl z4-`da0L2|)2E|Qb21Qe3fO21tK$&0wCHF@y|M{V@^PkT=+xYV9Eel$nAD`N}@LDq( zP6fJe9?uaH(s{-Y2}Nc=!X05o!cAdDLQ`ZQ@r+Xu?el9M6Aei8&VI=+bI#8Xi1YG3 zZvJ{GJ8jyai66eXW#L0V9*B1d21L3AH1EDE0fOxA%Kuj_K(Z@8; zhh3sgO$C*e1sm`;df~#uTJ^?&%w8mOeaR1<2d)mbFUT#NebQB(EdaAU( zAcUl|+Ycc{W1DO_m9TC&CDYhr$R&nxZolLO2!CK0mEB#Q;Ta z57xvpSNHso*z(SPy^if)xp3^obKigetoa}PcqB#;64Dv!hlC zhlV0Epy7@%qv577qoFA>&=}t%H1Z8-^lii5-|ScMGPjHPf$`u?AMf7x%lKo@|KyN& zpBpeA`%Fw=5G*|~bj4f(L^_B10iwtZfVd;ffVe5lfM|*gKo0E@AO!|M0zKIxlDRnK z2gmINhpilM{r!e9yC=slTT=Gvo`Iv1;E>KDKR6Vb0S-6}qR0$@xFgJfxGBtlXo?I# zj_na3(+z+G)ha{AB2bD24xDn}fz$G*O;dHsGlU9bpE?O<@K{Q)GbST^%5#sLpz>DPyT&h5?*@<|Ux)u<5iI z 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 aGj7~WG2dfbu&}0fvo6ApjYhraH1WSEXtNUl literal 41783 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jrxml index 46e9a23a3..105dcb19b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCorridas.jrxml @@ -1,8 +1,13 @@ - - - + + + + + + + + @@ -26,318 +31,531 @@ + <band height="102" splitType="Stretch"> <textField> - <reportElement x="69" y="20" width="733" height="20" uuid="bdb170bb-bfe6-4ea2-8702-2df0b015cd7d"/> + <reportElement x="141" y="20" width="1023" height="20" uuid="bdb170bb-bfe6-4ea2-8702-2df0b015cd7d"/> <textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="0" width="653" height="20" uuid="f6fe1c2b-09af-45e6-9883-f6aa7fe3016c"/> + <reportElement x="0" y="0" width="1015" height="20" uuid="f6fe1c2b-09af-45e6-9883-f6aa7fe3016c"/> <textElement markup="none"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{header.titulo.relatorio}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="20" width="69" height="20" uuid="3d8e6261-3551-411a-ab47-8ed23e80f41e"/> + <reportElement x="0" y="20" width="141" height="20" uuid="3d8e6261-3551-411a-ab47-8ed23e80f41e"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression> </textField> <textField> - <reportElement x="69" y="40" width="334" height="20" uuid="6c1cdde2-67c3-4a56-9744-5a4d249115f9"/> + <reportElement x="141" y="40" width="371" height="20" uuid="6c1cdde2-67c3-4a56-9744-5a4d249115f9"/> <textFieldExpression><![CDATA[$P{ORIGEN}]]></textFieldExpression> </textField> <textField> - <reportElement x="472" y="40" width="330" height="20" uuid="2879d620-3c3b-465f-9459-f94154b9e9c7"/> + <reportElement x="591" y="40" width="463" height="20" uuid="2879d620-3c3b-465f-9459-f94154b9e9c7"/> <textFieldExpression><![CDATA[$P{DESTINO}]]></textFieldExpression> </textField> <textField> - <reportElement x="69" y="60" width="334" height="20" uuid="06d06c40-6984-4a32-90e2-48e1d8cdcc9b"/> + <reportElement x="141" y="60" width="1023" height="20" uuid="06d06c40-6984-4a32-90e2-48e1d8cdcc9b"/> <textFieldExpression><![CDATA[$P{CORRIDA_ID}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="40" width="69" height="20" uuid="577578e8-3add-42a2-88c0-df7647b59844"/> + <reportElement x="0" y="40" width="141" height="20" uuid="577578e8-3add-42a2-88c0-df7647b59844"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.origem}]]></textFieldExpression> </textField> <textField> - <reportElement x="403" y="40" width="69" height="20" uuid="4f697f82-2de4-4665-af6f-4cc16270d631"/> + <reportElement x="512" y="40" width="79" height="20" uuid="4f697f82-2de4-4665-af6f-4cc16270d631"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.destino}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="60" width="69" height="20" uuid="20a767f1-d0d5-4485-9d6c-3c762e97bc70"/> + <reportElement x="0" y="60" width="141" height="20" uuid="20a767f1-d0d5-4485-9d6c-3c762e97bc70"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.servico}]]></textFieldExpression> </textField> <textField> - <reportElement x="653" y="0" width="149" height="20" uuid="96572021-01f9-4d05-938c-11ca5721f81c"/> + <reportElement x="1015" y="0" width="149" height="20" uuid="96572021-01f9-4d05-938c-11ca5721f81c"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="80" width="69" height="20" uuid="e24ed6f5-a072-4bda-b735-ef26b59fa179"/> + <reportElement x="0" y="80" width="141" height="20" uuid="e24ed6f5-a072-4bda-b735-ef26b59fa179"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.data.de}]]></textFieldExpression> </textField> <textField> - <reportElement x="268" y="80" width="69" height="20" uuid="efc3193a-c42a-4935-95ee-84f086336574"/> + <reportElement x="512" y="80" width="79" height="20" uuid="efc3193a-c42a-4935-95ee-84f086336574"/> <textElement markup="none"/> <textFieldExpression><![CDATA[$R{header.data.ate}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="69" y="80" width="199" height="20" uuid="110852df-8752-44d8-98ae-534a5cb8d5e2"/> + <reportElement x="141" y="80" width="371" height="20" uuid="110852df-8752-44d8-98ae-534a5cb8d5e2"/> <textFieldExpression><![CDATA[$P{DATA_DE}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement x="337" y="80" width="218" height="20" uuid="4d410653-2490-49ff-b176-530feaeab535"/> + <reportElement x="591" y="80" width="463" height="20" uuid="4d410653-2490-49ff-b176-530feaeab535"/> <textFieldExpression><![CDATA[$P{DATA_ATE}]]></textFieldExpression> </textField> - <line> - <reportElement x="0" y="100" width="802" height="1" uuid="7486e02d-1b43-45ab-b044-1a1d6ffdd364"/> - </line> </band> - - - + + + + + + + + + - - - - - - + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + @@ -350,9 +568,9 @@ - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioCorridasBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioCorridasBean.java index e90134dcd..705d6a838 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioCorridasBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioCorridasBean.java @@ -19,6 +19,7 @@ public class RelatorioCorridasBean { private String tipoPagamento; private String categoria; private String empresa; + private String status; private BigDecimal importeTaxaEmbarque; private BigDecimal importePedagio; private BigDecimal importeOutros; @@ -216,4 +217,12 @@ public class RelatorioCorridasBean { this.claseServicio = claseServicio; } + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + }