From 49f025898724cd157a415de3293267d73c701456 Mon Sep 17 00:00:00 2001 From: walace Date: Wed, 20 Apr 2022 14:40:37 +0000 Subject: [PATCH] fixes bug#24374 qua:silvania dev: Feito um ajuste nas contabilidades da ida e da volta, pois tinha 2 tarifas para o mesmo trecho e linha, no periodo informado git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@111956 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...trativoMovimentoPassageirosNovoLayout.java | 4 +- ...ativoMovimentoPassageirosNovoLayout.jasper | Bin 36011 -> 36009 bytes ...rativoMovimentoPassageirosNovoLayout.jrxml | 217 ++++++++++-------- 3 files changed, 130 insertions(+), 91 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java index 5c0633f71..16f8667aa 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java @@ -10,6 +10,7 @@ import java.util.Map; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends Relatorio { @@ -67,6 +68,7 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends String origem = map.get("origem").toString(); String destino = map.get("destino").toString(); String numRuta = map.get("numRuta").toString(); + BigDecimal tarifa = (BigDecimal) map.get("tarifa"); Long ida = (Long) map.get("totalida"); Long volta = (Long) map.get("totalvolta"); @@ -74,7 +76,7 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends if (origem.equals(rset.getString("destino")) && destino.equals(rset.getString("origem")) - && numRuta.equals(rset.getString("numRuta"))) { + && numRuta.equals(rset.getString("numRuta")) && (tarifa != null && MoneyHelper.isIgual(tarifa, rset.getBigDecimal("tarifa")))) { agrupar = true; if (ida == 0) { map.put("totalida", rset.getLong("totalida")); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jasper index b131a64e3dfed830905cbeae7863476c4e43b5e3..21eb2b2e0dae8379908483929d07477e9ca13b22 100644 GIT binary patch delta 1204 zcmZ2IlWFBlrVUSpSfdyi7^^04log%)U+A4cm(5bY6F(QU$-S!lP*dmpYV%)VHxAZt zpqeW{HJSoFdw07Wja!{=RiS))52wTQ&5bhJjI7BF3{2W!`CSEUr`ZA~NE%IVU3A*r zckARv8RN~ea&C;QRSZA?Ryq%>jJ4oOM?HH zWX%fo{ye!sOLViIVk4u#JjQncL9Z|Qd^l2f;EIeJ$L9S?c8mhM51gJaxbKneRkhvi z_6a^klNYF2Pxeqb2lWu6rl!DjmV{`t^N07`5{X|@*5$JYtfXJ{GSojHC0kCjzc*a4 z$>MbB*FDoOJ2-A$pvDLD4@iDnbkjk`-g?aih zD^_fm5)IkG`0cI79k6t%=5K-aXATr>5mV6 zdaK{#q~l?0+kqTHrLZ+6qspV=*21; z6zI6?s@yVRuV)~c$&2)VKs^l7yhvD9>@n|@EiALQ_;`Ny?F1{~GW-nnFi1)JskXhZ zs*edpUC&yuG0SlcSV^wYPgW0L92-prDVf9a@a4mO2XY@Vr`y?1_kIg@!Zl+9MuDC# z*(b-oC+?T9TW^)f;&vGnN0apw6*v2sE)x_o(lfL)Gc+}T0VC7NEbbcij0S}abxgt~ z3@jx@rKun`e+dIbPzWkmQ2+wPKsg4RHdogxq1NZ;9+@36S+mo>cXPh`HV%G^)n^o) zv+o+{9{RgR*vV_NNx%(U5;`)yxB3>h)G~W+Q+RK zGrG@le7vdc`_9>FvSYB^=7ph|u-N4f_Z66~>)En@SJH+V8|Ux*z2A!$s77>iV|X~T zz|IukD+g+i^YML3OF4Yp$#U|GsQm)nY;pme8Iv!Rt`F0nyTD#7)CwKOn%$n+cWpZtr z-sFzh&rHB@uZ`0cnEHnKSNxk>OLzYYd%fX_&x^?csm7b%#w9WeOnIatr?^~WE9cpt ziDwTvB!OfmPfXa(ICZjTqOL&4%(NfD2RYyPYc);jy_kEs{}SlfltM^R_1n=JU6lFHG>e z3AR`?Lyt*c=G4Dk`+z>zV+>|wPz*}VNi4}P%FK5PNR2l%Gc_ay(a+9a_hyehlG2Y_< delta 1218 zcmZvbdobKr6vuye*~Hr=q&pE28jnp_`^aKZkKI_WMM5xwdK)w(K|C@@gru5av#zK# z$Tsby3{~8UXK0&XbW*7i6{IQEt!mPE4UKs9w>$D*&tGTm_jB&O-*fJ*yG5zLMQM`h zQvC@6h*7hlKHAoO4aHYSYdYU6Z3(KVm)*a@cgCB0geue!l9?tMI&7W!L`^atM|(w7 zYGm&gHRAmJM*#ICK~U@!`q#oxdY^&M&7t+!1s30@3FYtSV8a7KKot{YD43fG7m_BH zT35FI6cxQy7XkdaQ38P1{vkZShYuuUMoWU`hb}AV(qVnfFwO_CDsrylNn?*8VI>ob zCcO{gUK1w(n{Af5Z-b8cBbjwm(Mp0RNNVPQJPr-*7y@)Ul;&$U*j_i3n*1Hqr`qIN zu0X`5BRhWNNV~z?37W;Sj(v^ym-==>6)ZK=dgn*6Md1`rmi>D)ZQl)XL8WV;VheMN zQ4o$cEv#SxUY7LdjMg$?b!+>UyHp{cr?10?L<`Mw&oI@?F`l$nW&8wu>97_B_D(;; z{!dMH#1D$m@S;nIygO*va&@PHcbIf|#d07`<<9D~RonLCV5Z*>B*MnF3_5@%#mlZI zhfm+jkl+_z^}3tL6?E77&5mJtaZ}lZ@{Lbl+_ufMjc`hE8B-u?tmPfUa-=>n*|%WM z&)j;?pyu?3?=c0E%wD60lQU)`IU;EpT+iDVB`DExd0n{XR;jqcFB~R-74(*jxs4VU z9B5Qu_Ht8^&j>M$jj@P(Pe+%-u;VdpSR5N3lf`8+nQR-R>~0}Y;_*1=h&;-kbV4~j z^?aN>*G?ytxNM$0)!kXnIxCMfa*1%Pt;y8aisangE%6IrH40nsNACAkw7Vv+7fHK4 zO0T6VMRa>|G4uEv0PHc{Um3s#uM_D#rECA{iE&J-B zjq#jbj}i38sb1L17)g8X-AauMF!~}n$XAGPr~`0D^PyJov)RDS6ts7{-1^whM~ehK z$TIBZF0e^HdnaTVPKU_oS0JUO`MH)3ToA_aXHj-M0~LlZs}bw+zd?pOG7dL|l`h^H zL(Gk*(<2V_v$1}?NEFAxb00}REOnuMV)IK|I2OWkb9V-*evE1tk%t|*!4W> z{n_m8PDvMk1)Ibg0PTj^4lVC~d!;PeBaKOsCP~kOCFB@y1;0tNMOoWZCH;=)`vqlw zgE%`r1VHh3vS&Xm)EJ41*uHI(x_qGC%+z4*JKPj!Hk1ns|nP uJT8J|!)9}BZMZBhkHw2%b9h`HPDxrY-mCY2QaU=}bpYiis-mi5&Hn(3Oy&>( diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jrxml index 3eb0094c9..53b8644d7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jrxml @@ -1,8 +1,8 @@ - - - - + + + + @@ -42,144 +42,168 @@ <band height="176" splitType="Stretch"> <staticText> - <reportElement mode="Transparent" x="0" y="0" width="570" height="41" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> + <reportElement uuid="48387206-d35a-46c3-92bc-7337730b5b29" mode="Transparent" x="0" y="0" width="555" height="41" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[QUADRO DEMONSTRATIVO DO MOVIMENTO DE PASSAGEIROS]]></text> </staticText> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="654" y="0" width="95" height="25" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> + <reportElement uuid="08f1d92b-4dee-433a-b066-f1b568988bce" mode="Transparent" x="654" y="0" width="95" height="25" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[new java.util.Date()]]></textFieldExpression> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="570" y="25" width="84" height="16" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> + <reportElement uuid="98b19fb9-fbbf-4a0d-972d-4984bfba62b0" mode="Transparent" x="555" y="25" width="99" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["Página " + $V{PAGE_NUMBER}+ " de " + $V{PAGE_NUMBER}]]></textFieldExpression> + <textFieldExpression><![CDATA["Página " + $V{PAGE_NUMBER}+ " de " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> <line> - <reportElement x="-1" y="48" width="750" height="1"/> + <reportElement uuid="0ef26664-c3c7-4239-b964-4dd4c07dc70e" x="-1" y="48" width="750" height="1"/> </line> <line> - <reportElement positionType="Float" x="-1" y="160" width="750" height="1"/> + <reportElement uuid="75af562f-9dac-46dc-8b06-1e50896893d0" positionType="Float" x="-1" y="160" width="750" height="1"/> </line> <staticText> - <reportElement x="-1" y="49" width="63" height="22"/> - <textElement lineSpacing="Single"> + <reportElement uuid="8816e3ed-08fc-44c4-9b5c-90065a97ea1f" x="-1" y="49" width="78" height="22"/> + <textElement> <font isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[Empresa:]]></text> </staticText> <textField> - <reportElement x="62" y="49" width="509" height="22"/> - <textElement lineSpacing="Single"/> - <textFieldExpression class="java.lang.String"><![CDATA[$P{EMPRESA}]]></textFieldExpression> + <reportElement uuid="e4dcbf34-9a95-47d4-9d85-ef9c75ed8270" x="77" y="49" width="577" height="22"/> + <textElement> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="71" width="251" height="20"/> - <textElement lineSpacing="Single"> + <reportElement uuid="bbfa56eb-b0e4-4ce8-95ec-03fa5fecdaa5" x="0" y="71" width="306" height="20"/> + <textElement> <font isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["Período: " + $P{DATA_DE} + " a " + $P{DATA_ATE}]]></textFieldExpression> + <textFieldExpression><![CDATA["Período: " + $P{DATA_DE} + " a " + $P{DATA_ATE}]]></textFieldExpression> </textField> <staticText> - <reportElement x="0" y="133" width="50" height="20"/> - <textElement lineSpacing="Single"> + <reportElement uuid="09cdf961-cdc2-4062-94e2-241e21a728b5" x="0" y="133" width="50" height="20"/> + <textElement> <font isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[Linha:]]></text> </staticText> <textField> - <reportElement x="150" y="133" width="425" height="20"/> - <textElement lineSpacing="Single"/> - <textFieldExpression class="java.lang.String"><![CDATA[$P{DESC_LINHAS_SELECIONADAS}]]></textFieldExpression> + <reportElement uuid="70f366bb-2104-429a-8899-66f853c0f260" x="150" y="133" width="405" height="20"/> + <textElement> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{DESC_LINHAS_SELECIONADAS}]]></textFieldExpression> </textField> <staticText> - <reportElement x="0" y="91" width="77" height="20"/> - <textElement lineSpacing="Single"> + <reportElement uuid="2284285a-4769-4bc9-b48d-ea18d3a2b726" x="0" y="91" width="77" height="20"/> + <textElement> <font isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[Tipo de Data:]]></text> </staticText> <staticText> - <reportElement x="77" y="91" width="73" height="20"/> - <textElement lineSpacing="Single"> + <reportElement uuid="6650b65f-2a11-4a23-8afd-c1b2a46c2e47" x="77" y="91" width="73" height="20"/> + <textElement> <font isBold="false"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[SERVIÇO]]></text> </staticText> <staticText> - <reportElement x="0" y="111" width="77" height="20"/> - <textElement lineSpacing="Single"> + <reportElement uuid="251da91e-5f8e-452d-9ed9-4414e4d88cc5" x="0" y="111" width="77" height="20"/> + <textElement> <font isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[Lugar Ofer:]]></text> </staticText> <textField isBlankWhenNull="true"> - <reportElement x="77" y="113" width="498" height="20"/> - <textElement lineSpacing="Single"/> - <textFieldExpression class="java.lang.String"><![CDATA[$P{CANTASIENTOS}]]></textFieldExpression> + <reportElement uuid="c023bf07-8aa7-4848-a922-a556dd64c576" x="77" y="113" width="478" height="20"/> + <textElement> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{CANTASIENTOS}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement x="50" y="133" width="100" height="20"/> - <textElement lineSpacing="Single"/> - <textFieldExpression class="java.lang.String"><![CDATA[$P{LINHAS}]]></textFieldExpression> + <reportElement uuid="379fb4cf-7160-4ed9-b230-c5613786e420" x="50" y="133" width="100" height="20"/> + <textElement> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{LINHAS}]]></textFieldExpression> </textField> </band> - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + @@ -188,101 +212,114 @@ - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - - + + + - + - - + + +