From 497c3476bc59c5edf195f9b55d5345cc4ed6320c Mon Sep 17 00:00:00 2001 From: celio Date: Fri, 2 Jun 2023 20:03:26 -0300 Subject: [PATCH] fixes bug#AL-2518 --- pom.xml | 2 +- .../impl/RelatorioComissaoSintetico.java | 25 +- .../RelatorioComissaoSintetico.jasper | Bin 58840 -> 50014 bytes .../RelatorioComissaoSintetico.jrxml | 291 ++++++++---------- .../RelatorioComissaoController.java | 1 + 5 files changed, 148 insertions(+), 171 deletions(-) diff --git a/pom.xml b/pom.xml index fa8eafac9..72d278c68 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.7.3 + 1.7.4 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java index b92e81dc7..634543173 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java @@ -75,11 +75,11 @@ private Set pontoVendaConfiguracao; Integer retEmpresaID = rset.getInt("empresa_id"); Integer estadoId = rset.getInt("estado_id"); Date fecCorrida = rset.getDate("feccorrida"); - BigDecimal totalPassgens = rset.getBigDecimal("total_passagem"); - BigDecimal totalImpPost = rset.getBigDecimal("total_imp_posterior"); - BigDecimal totalVendaImpPost = rset.getBigDecimal("total_venda_imp_posterior"); - BigDecimal totalSeguro = rset.getBigDecimal("total_seguro"); - BigDecimal totalVenda = rset.getBigDecimal("total_venda"); + BigDecimal totalPassgens = rset.getBigDecimal("total_passagem") == null ? BigDecimal.ZERO : rset.getBigDecimal("total_passagem"); + BigDecimal totalImpPost = rset.getBigDecimal("total_imp_posterior") == null ? BigDecimal.ZERO : rset.getBigDecimal("total_imp_posterior"); + BigDecimal totalVendaImpPost = rset.getBigDecimal("total_venda_imp_posterior") == null ? BigDecimal.ZERO : rset.getBigDecimal("total_venda_imp_posterior"); + BigDecimal totalSeguro = rset.getBigDecimal("total_seguro") == null ? BigDecimal.ZERO : rset.getBigDecimal("total_seguro"); + BigDecimal totalVenda = rset.getBigDecimal("total_venda") == null ? BigDecimal.ZERO : rset.getBigDecimal("total_venda"); RelatorioComissaoSinteticoBean existingBean = findExistingBean(lsDadosRelatorio, agenciaID, retEmpresaID); if (existingBean != null) { // Registro já existe, adicionar os valores aos existentes @@ -103,8 +103,15 @@ private Set pontoVendaConfiguracao; comissaoBean.setTotalTarifa(totalPassgens); comissaoBean.setTotalImpPosterior(totalImpPost); comissaoBean.setTotalVendaImpPosterior(totalVendaImpPost); + comissaoBean.setTotalOutros(BigDecimal.ZERO); + comissaoBean.setTotalExcBagagem(BigDecimal.ZERO); comissaoBean.setTotalSeguro(totalSeguro); comissaoBean.setTotalPagado(totalVenda); + comissaoBean.setComissaoTarifa(BigDecimal.ZERO); + comissaoBean.setComissaoVendaImpPosterior(BigDecimal.ZERO); + comissaoBean.setComissaoImpPosterior(BigDecimal.ZERO); + comissaoBean.setComissaoExcBagagem(BigDecimal.ZERO); + comissaoBean.setComissaoOutros(BigDecimal.ZERO); //aplica comissão dos totais if (configComissao != null) { @@ -262,6 +269,14 @@ private Set pontoVendaConfiguracao; } public void setLsDadosRelatorio(List lsDadosRelatorio) { + lsDadosRelatorio.forEach(bean -> { + BigDecimal totalComissoes = bean.getComissaoTarifa() + .add(bean.getComissaoImpPosterior()) + .add(bean.getComissaoVendaImpPosterior()) + .add(bean.getComissaoExcBagagem()) + .add(bean.getComissaoOutros()); + bean.setComissaoTotal(totalComissoes); + }); this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio)); this.lsDadosRelatorio = lsDadosRelatorio; } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioComissaoSintetico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioComissaoSintetico.jasper index 44aff27ca8e02ae6bf25fa87a362c4a5892b4db2..8551b005c6d08318d2f0c2c14a957c11ac500b12 100644 GIT binary patch literal 50014 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 literal 58840 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
DfA75i-H~q%oaNJ&l8OqNxUV4E3g@x_+Dd2u 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 U+g - - + + @@ -14,6 +14,7 @@ + @@ -33,11 +34,7 @@ - + @@ -77,107 +74,71 @@ - <band height="127"> - <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement uuid="32538cdd-7697-4a03-8035-f9474e869395" x="495" y="0" width="80" height="16"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8"/> + <band height="69"> + <textField pattern="" isBlankWhenNull="false"> + <reportElement uuid="7d6110a7-d2cc-43d4-85f4-748b1dfef63f" mode="Transparent" x="0" y="1" width="455" height="46" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" 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> + <textFieldExpression><![CDATA[$R{header.titulo}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> + <reportElement uuid="af7a6042-c9c4-4d13-ae07-24c189ead5fa" mode="Transparent" x="741" y="1" width="80" height="15" 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><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="abc399f3-d012-46aa-b4e9-678ab812bee4" x="382" y="0" width="113" height="16"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8"/> + <reportElement uuid="54e92cd2-863e-4030-819d-6708b15288d4" x="525" y="1" width="216" height="15"/> + <textElement textAlignment="Right"> + <font size="9" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="f25e6675-4dcb-4d37-8586-e50abe4013af" x="70" y="53" width="505" height="20"/> - <textElement> - <font size="8"/> - </textElement> - <textFieldExpression><![CDATA[($P{DATA_INICIAL} != null ? new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL}) + " à " + new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}) : "")]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="e15cecc4-995a-4cbc-934e-44970c809849" x="2" y="53" width="68" height="20"/> - <textElement/> - <textFieldExpression><![CDATA[$R{header.periodo.venda}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="d3d41ddb-2dbb-4b0e-bf82-02af7f81b63f" x="2" y="72" width="68" height="20" isRemoveLineWhenBlank="true"/> - <textElement/> - <textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="7bc881ef-b270-4178-8416-54ad2602eaab" x="70" y="92" width="505" height="20" isRemoveLineWhenBlank="true"/> - <textElement> - <font size="8"/> - </textElement> - <textFieldExpression><![CDATA[$P{NUMPUNTOVENTA}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="33bc773a-8bd3-4bc0-946c-664d78a19f5c" x="70" y="72" width="505" height="20" isRemoveLineWhenBlank="true"/> - <textElement> - <font size="8"/> - </textElement> - <textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="c3b8e525-e015-4aaa-a505-1a92f3d6b0fb" x="2" y="92" width="68" height="20" isRemoveLineWhenBlank="true"/> - <textElement/> - <textFieldExpression><![CDATA[$R{header.filtro.pontoVenda}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement uuid="3bc4a172-01c3-4821-a595-9b2f7e794e90" stretchType="RelativeToTallestObject" x="70" y="112" width="505" height="14"/> - <textElement> - <font size="8"/> - </textElement> - <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> - </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="7057e2fc-1c0c-4600-9052-26476c93b8f1" mode="Transparent" x="2" y="112" width="42" height="14" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> + <reportElement uuid="b2356913-1078-4115-9eb1-3cd8f39871cf" mode="Transparent" x="525" y="16" width="270" 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><![CDATA[$R{header.filtros}]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{header.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{header.de}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="83ba776d-57a0-428e-a059-7e0f7412ba27" x="357" y="36" width="218" height="16"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8"/> + <textField pattern="" isBlankWhenNull="false"> + <reportElement uuid="6778dcc2-1b22-4309-9b98-2c394396ec0b" stretchType="RelativeToBandHeight" mode="Transparent" x="525" y="32" width="296" height="15" 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><![CDATA[$R{header.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{header.impressorPor}+" "+$P{USUARIO}+" - "+$P{USUARIO_NOME}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="46a0fd96-3aa5-4f54-9315-5402efe99381" x="2" y="0" width="355" height="53"/> - <textElement> - <font size="20" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$R{header.titulo}]]></textFieldExpression> - </textField> - <textField evaluationTime="Report"> - <reportElement uuid="4458c46c-d661-4cf5-999e-fd9b7e5d60ad" x="546" y="16" width="29" height="20"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8"/> + <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> + <reportElement uuid="f47919d9-1e34-4ca4-990b-f0167628068e" mode="Transparent" x="795" y="16" width="26" 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><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="8b45dca8-0cf5-4c10-aaa7-fce7b2d596c5" x="470" y="16" width="76" height="20"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8"/> - <paragraph rightIndent="2"/> + <textField isStretchWithOverflow="true"> + <reportElement uuid="99f553a0-2256-4eb5-81bf-215b7ba57fd1" x="0" y="47" width="819" height="21"/> + <box leftPadding="2"> + <topPen lineWidth="0.75"/> + <bottomPen lineWidth="0.75"/> + </box> + <textElement verticalAlignment="Middle"> + <font size="12" isBold="true"/> </textElement> - <textFieldExpression><![CDATA[$R{header.pagina}+" "+$V{PAGE_NUMBER}+" de"]]></textFieldExpression> + <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> </textField> </band> - + - + @@ -185,12 +146,12 @@ - + - + @@ -198,12 +159,12 @@ - + - + @@ -211,12 +172,12 @@ - + - + @@ -224,12 +185,12 @@ - + - + @@ -237,12 +198,12 @@ - + - + @@ -250,12 +211,12 @@ - + - + @@ -263,12 +224,12 @@ - + - + @@ -276,12 +237,12 @@ - + - + @@ -289,12 +250,12 @@ - + - + @@ -302,25 +263,25 @@ - + - + - - + + - + @@ -328,12 +289,12 @@ - + - + @@ -341,16 +302,16 @@ - + - + - + @@ -360,98 +321,98 @@ - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + @@ -460,125 +421,125 @@ - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioComissaoController.java index f15dff16c..04f00d1ef 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioComissaoController.java @@ -146,6 +146,7 @@ public class RelatorioComissaoController extends MyGenericForwardComposer { parametros.put("DATA_FINAL", (java.util.Date) this.datFinal.getValue()); parametros.put("TITULO", Labels.getLabel("relatorioComissaoController.window.title")); parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); + parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario()); parametros.put("NUMPUNTOVENTA", puntoVentaIds); filtro.append(" Empresa: ");