fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#21486 

qua:
dev:
Houve um problema na worskpace da ADM, ocorreu um pequeno atraso na entrega do mantis.

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@105780 d1611594-4594-4d17-8e1d-87c2c4800839
master
walace 2021-03-16 09:56:40 +00:00
parent 14a8573193
commit 928ce38901
3 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java
View File

@ -51,34 +51,36 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("SELECT "); sb.append("SELECT ");
sb.append(" CAJA.PONTOVENTA,"); sb.append(" BOLETO.PONTOVENTA,");
sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(3) THEN CAJA.IMPORTE END), 0) AS ANTT,"); sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(3) THEN BOLETO.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 BOLETO.ORGAOCONCEDENTEID IN(27) THEN BOLETO.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 BOLETO.FORMAPAGO IN(2) THEN BOLETO.IMPORTE END), 0) AS CARTAO,");
sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(27, 3) THEN CAJA.IMPORTE END), 0) AS VALORBASECALCULO, "); sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(27, 3) THEN BOLETO.IMPORTE END), 0) AS VALORBASECALCULO, ");
sb.append(" COALESCE(SUM(CASE WHEN CAJA.INDTRIBTARIFA IN(1) THEN CAJA.IMPORTE END), 0) AS ISENTO, "); sb.append(" COALESCE(SUM(CASE WHEN BOLETO.INDTRIBTARIFA IN(1) THEN BOLETO.IMPORTE END), 0) AS ISENTO, ");
sb.append(" CAJA.NOMECLASSE AS NOMECLASSE, "); sb.append(" BOLETO.NOMEESTADO AS NOMEESTADO ");
sb.append(" CAJA.NOMEESTADO AS NOMEESTADO ");
sb.append("FROM "); sb.append("FROM ");
sb.append(" (SELECT PV.NOMBPUNTOVENTA AS PONTOVENTA,"); sb.append(" (SELECT PV.NOMBPUNTOVENTA AS PONTOVENTA,");
sb.append(" OC.DESCORGAO AS ORGAO,"); sb.append(" OC.DESCORGAO AS ORGAO,");
sb.append(" OC.ORGAOCONCEDENTE_ID AS ORGAOCONCEDENTEID,"); sb.append(" OC.ORGAOCONCEDENTE_ID AS ORGAOCONCEDENTEID,");
sb.append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL THEN CFP.IMPORTE ELSE 0 END AS IMPORTE, "); sb.append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL AND C.INDSTATUSBOLETO not IN ('T') THEN CFP.IMPORTE ELSE 0 END AS IMPORTE, ");
sb.append(" FP.FORMAPAGO_ID AS FORMAPAGO,"); sb.append(" FP.FORMAPAGO_ID AS FORMAPAGO,");
sb.append(" EI.porcredbaseicms,"); sb.append(" EI.porcredbaseicms,");
sb.append(" EST.NOMBESTADO AS NOMEESTADO, "); sb.append(" EST_PUNTOVENTA.NOMBESTADO AS NOMEESTADO, ");
sb.append(" CS.DESCCLASE AS NOMECLASSE, "); sb.append(" CS.DESCCLASE AS NOMECLASSE, ");
sb.append(" R.INDTRIBTARIFA AS INDTRIBTARIFA "); sb.append(" R.INDTRIBTARIFA AS INDTRIBTARIFA ");
sb.append(" "); sb.append(" ");
sb.append(" FROM CAJA C"); sb.append(" FROM BOLETO C");
sb.append(" INNER JOIN CAJA_FORMAPAGO CFP ON (C.CAJA_ID = CFP.CAJA_ID AND CFP.ACTIVO = 1)"); sb.append(" INNER JOIN BOLETO_FORMAPAGO CFP ON (C.BOLETO_ID = CFP.BOLETO_ID AND CFP.ACTIVO = 1)");
sb.append(" INNER JOIN FORMA_PAGO FP ON (FP.FORMAPAGO_ID = CFP.FORMAPAGO_ID)"); 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 and pv.activo = 1"); 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 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 ORGAO_CONCEDENTE OC ON (R.ORGAOCONCEDENTE_ID = OC.ORGAOCONCEDENTE_ID)");
sb.append(" INNER JOIN PARADA ORI ON C.ORIGEN_ID = ORI.PARADA_ID"); 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 CIUDAD CO ON CO.CIUDAD_ID = ORI.CIUDAD_ID");
sb.append(" INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID and EST.activo = 1"); sb.append(" INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID and EST.activo = 1");
sb.append(" INNER JOIN PARADA ORI_PUNTOVENTA ON PV.PARADA_ID = ORI_PUNTOVENTA.PARADA_ID");
sb.append(" INNER JOIN CIUDAD CO_PUNTOVENTA ON CO_PUNTOVENTA.CIUDAD_ID = ORI_PUNTOVENTA.CIUDAD_ID");
sb.append(" INNER JOIN ESTADO EST_PUNTOVENTA ON EST_PUNTOVENTA.ESTADO_ID = CO_PUNTOVENTA.ESTADO_ID and EST_PUNTOVENTA.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 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(" INNER JOIN CLASE_SERVICIO CS ON (C.CLASESERVICIO_ID = CS.CLASESERVICIO_ID ) ");
sb.append(" WHERE C.ACTIVO = 1"); sb.append(" WHERE C.ACTIVO = 1");
@ -99,9 +101,9 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio {
if (parametros.get("CLASESERVICIO_ID") != null && !parametros.get("CLASESERVICIO_ID").toString().equals("-1")) { if (parametros.get("CLASESERVICIO_ID") != null && !parametros.get("CLASESERVICIO_ID").toString().equals("-1")) {
sb.append(" AND C.CLASESERVICIO_ID = " + parametros.get("CLASESERVICIO_ID").toString() + " "); sb.append(" AND C.CLASESERVICIO_ID = " + parametros.get("CLASESERVICIO_ID").toString() + " ");
} }
sb.append(" ) CAJA "); sb.append(" ) BOLETO ");
sb.append(" GROUP BY CAJA.PONTOVENTA, CAJA.NOMEESTADO, CAJA.NOMECLASSE "); sb.append(" GROUP BY BOLETO.PONTOVENTA, BOLETO.NOMEESTADO ");
sb.append(" ORDER BY CAJA.NOMEESTADO, CAJA.PONTOVENTA, CAJA.NOMECLASSE "); sb.append(" ORDER BY BOLETO.NOMEESTADO, BOLETO.PONTOVENTA ");
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sb.toString()); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sb.toString());
@ -128,11 +130,12 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio {
bean.setAGERBA(getValor("AGERBA", rset)); bean.setAGERBA(getValor("AGERBA", rset));
bean.setCartao(getValor("CARTAO", rset)); bean.setCartao(getValor("CARTAO", rset));
aVISTA = MoneyHelper.somar(bean.getANTT(), bean.getAGERBA()).subtract(bean.getCartao()); aVISTA = MoneyHelper.somar(bean.getANTT(), bean.getAGERBA()).subtract(bean.getCartao());
if(MoneyHelper.isIgual(aVISTA, BigDecimal.ZERO)) {
continue;
}
bean.setAVista(aVISTA); bean.setAVista(aVISTA);
bean.setIsento(getValor("ISENTO", rset));
bean.setValorBaseCalculo(getValor("VALORBASECALCULO", rset)); bean.setValorBaseCalculo(getValor("VALORBASECALCULO", rset));
bean.setNomeEstado(StringUtils.defaultString(rset.getString("NOMEESTADO"))); bean.setNomeEstado(StringUtils.defaultString(rset.getString("NOMEESTADO")));
bean.setNomeClasse(StringUtils.defaultString(rset.getString("NOMECLASSE")));
lsDadosRelatorio.add(bean); lsDadosRelatorio.add(bean);

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper
View File

Binary file not shown.

42
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jrxml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioDevolucaoBilhetesFinanceiro" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2"> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioDevolucaoBilhetesFinanceiro" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="3.8974342000000037"/> <property name="ireport.zoom" value="2.2000000000000015"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/> <style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
@ -64,7 +64,7 @@
<variableExpression><![CDATA[$F{isento}]]></variableExpression> <variableExpression><![CDATA[$F{isento}]]></variableExpression>
</variable> </variable>
<variable name="TOTAL_GERAL" class="java.math.BigDecimal"> <variable name="TOTAL_GERAL" class="java.math.BigDecimal">
<variableExpression><![CDATA[$V{subTotalANTT}.add( $V{subTotalAVista} ).add($V{subTotalAGERBA}).add($V{subTotalCARTAO}).add($V{subTotalValorBaseCalculo}).add($V{sutTotalIsento})]]></variableExpression> <variableExpression><![CDATA[$V{subTotalANTT}.add( $V{subTotalAVista} ).add($V{subTotalAGERBA}).add($V{subTotalCARTAO}).add($V{subTotalValorBaseCalculo})]]></variableExpression>
</variable> </variable>
<background> <background>
<band splitType="Stretch"/> <band splitType="Stretch"/>
@ -83,7 +83,7 @@
<reportElement x="0" y="63" width="802" height="1" uuid="d9b398e6-2fe9-4a3d-bceb-f9db7a06e5a9"/> <reportElement x="0" y="63" width="802" height="1" uuid="d9b398e6-2fe9-4a3d-bceb-f9db7a06e5a9"/>
</line> </line>
<textField> <textField>
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="0" y="63" width="46" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="11b7c338-166a-4149-b45c-b47698bd88ea"/> <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="0" y="63" width="117" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="11b7c338-166a-4149-b45c-b47698bd88ea"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -91,7 +91,7 @@
<textFieldExpression><![CDATA[$R{label.filtros}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.filtros}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="46" y="63" width="756" height="14" uuid="98fc1c7e-3fee-4c70-924f-2cbb17fd243f"/> <reportElement stretchType="RelativeToTallestObject" x="117" y="63" width="685" height="14" uuid="98fc1c7e-3fee-4c70-924f-2cbb17fd243f"/>
<textElement verticalAlignment="Top"> <textElement verticalAlignment="Top">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
@ -205,13 +205,6 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.valorBaseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.valorBaseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="496" y="1" width="107" height="15" isPrintWhenDetailOverflows="true" uuid="60cc6a71-4f40-49de-9f78-08b65931d16d"/>
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.isento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="342" y="1" width="75" height="14" isPrintWhenDetailOverflows="true" uuid="a46545d1-264f-4dd1-8d6e-fa62df9cf49b"/> <reportElement stretchType="RelativeToTallestObject" x="342" y="1" width="75" height="14" isPrintWhenDetailOverflows="true" uuid="a46545d1-264f-4dd1-8d6e-fa62df9cf49b"/>
<textElement verticalAlignment="Middle" markup="none"> <textElement verticalAlignment="Middle" markup="none">
@ -241,19 +234,12 @@
<textFieldExpression><![CDATA[$R{label.ANTT}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.ANTT}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="708" y="1" width="94" height="15" isPrintWhenDetailOverflows="true" uuid="c20cbb60-0bc7-46a7-a539-fd1f97d5630c"/> <reportElement stretchType="RelativeToTallestObject" x="496" y="1" width="107" height="15" isPrintWhenDetailOverflows="true" uuid="c20cbb60-0bc7-46a7-a539-fd1f97d5630c"/>
<textElement verticalAlignment="Middle" markup="none"> <textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.nomeEstado}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.nomeEstado}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="603" y="1" width="105" height="15" isPrintWhenDetailOverflows="true" uuid="af5b0cea-70e3-49b5-be9b-be31497facf5"/>
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.nomeClasse}]]></textFieldExpression>
</textField>
</band> </band>
</columnHeader> </columnHeader>
<detail> <detail>
@ -301,20 +287,12 @@
<textFieldExpression><![CDATA[$F{AVista}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{AVista}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="708" y="5" width="94" height="14" isPrintWhenDetailOverflows="true" uuid="7b958b83-17b4-4f93-aa23-30bca836f969"/> <reportElement stretchType="RelativeToTallestObject" x="496" y="5" width="107" height="14" isPrintWhenDetailOverflows="true" uuid="7b958b83-17b4-4f93-aa23-30bca836f969"/>
<textElement verticalAlignment="Top" markup="none"> <textElement verticalAlignment="Top" markup="none">
<font size="6" isBold="false"/> <font size="6" isBold="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{nomeEstado}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nomeEstado}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00;-#,##0.00">
<reportElement x="496" y="5" width="107" height="14" uuid="5e0d5e33-3f2c-4351-9a24-e0ae438b07a6"/>
<textFieldExpression><![CDATA[$F{isento}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="603" y="5" width="105" height="14" uuid="a9484980-4ad4-4d17-993b-4641987815cf"/>
<textFieldExpression><![CDATA[$F{nomeClasse}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<lastPageFooter> <lastPageFooter>
@ -325,7 +303,7 @@
<textField> <textField>
<reportElement stretchType="RelativeToTallestObject" x="0" y="11" width="117" height="14" uuid="c57012f1-edf2-4505-86c8-693c38a8a0cf"/> <reportElement stretchType="RelativeToTallestObject" x="0" y="11" width="117" height="14" uuid="c57012f1-edf2-4505-86c8-693c38a8a0cf"/>
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
<font size="6"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
</textField> </textField>
@ -355,14 +333,10 @@
<reportElement x="342" y="11" width="75" height="14" uuid="9d6e8ef2-c004-467a-af51-88aaad9b2294"/> <reportElement x="342" y="11" width="75" height="14" uuid="9d6e8ef2-c004-467a-af51-88aaad9b2294"/>
<textFieldExpression><![CDATA[$V{subTotalAVista}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{subTotalAVista}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00;-#,##0.00">
<reportElement x="496" y="12" width="107" height="14" uuid="3dc8bf9b-613f-44d3-8380-48a767704697"/>
<textFieldExpression><![CDATA[$V{sutTotalIsento}]]></textFieldExpression>
</textField>
<textField> <textField>
<reportElement stretchType="RelativeToTallestObject" x="603" y="12" width="105" height="14" uuid="699a7d01-48e8-48a0-bdcb-29f5ff2513ff"/> <reportElement stretchType="RelativeToTallestObject" x="603" y="12" width="105" height="14" uuid="699a7d01-48e8-48a0-bdcb-29f5ff2513ff"/>
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
<font size="6"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.totalGeral}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.totalGeral}]]></textFieldExpression>
</textField> </textField>