fixes bug#AL-3366
parent
74ce8c3d60
commit
67a1530e06
2
pom.xml
2
pom.xml
|
@ -4,7 +4,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>br.com.rjconsultores</groupId>
|
||||
<artifactId>ventaboletosadm</artifactId>
|
||||
<version>1.29.0</version>
|
||||
<version>1.30.0</version>
|
||||
<packaging>war</packaging>
|
||||
|
||||
<properties>
|
||||
|
|
|
@ -17,7 +17,9 @@ import java.util.Map;
|
|||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
|
||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
|
||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioResumoLinhasBean;
|
||||
import com.rjconsultores.ventaboletos.service.ConstanteService;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext;
|
||||
|
||||
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
|
||||
|
||||
|
@ -28,6 +30,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
|
|||
public class RelatorioResumoLinhasAnaliticoSimplificadoSumarizado extends Relatorio {
|
||||
|
||||
private List<RelatorioResumoLinhasBean> lsDadosRelatorio;
|
||||
private static String CONSTANTE_GRATUIDADE_CRIANCA;
|
||||
|
||||
/**
|
||||
* @param parametros
|
||||
|
@ -42,7 +45,7 @@ public class RelatorioResumoLinhasAnaliticoSimplificadoSumarizado extends Relato
|
|||
Integer rutaId = parametros.get("RUTA_ID") != null ? Integer.valueOf(parametros.get("RUTA_ID").toString()) : null;
|
||||
Integer empresaId = parametros.get("EMPRESA_ID") != null ? Integer.valueOf(parametros.get("EMPRESA_ID").toString()) : null;
|
||||
Integer grupoRutaId = parametros.get("GRUPORUTA_ID") != null ? Integer.valueOf(parametros.get("GRUPORUTA_ID").toString()) : null;
|
||||
|
||||
CONSTANTE_GRATUIDADE_CRIANCA = buscarConstante("GRATUIDADE_CRIANCA");
|
||||
String sql = getSql(rutaId, grupoRutaId);
|
||||
|
||||
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
|
||||
|
@ -66,6 +69,7 @@ public class RelatorioResumoLinhasAnaliticoSimplificadoSumarizado extends Relato
|
|||
stmt.setInt("GRUPORUTA_ID", grupoRutaId);
|
||||
}
|
||||
stmt.setInt("EMPRESA_ID", empresaId.intValue());
|
||||
stmt.setString("CRIANCA_ID",CONSTANTE_GRATUIDADE_CRIANCA);
|
||||
rset = stmt.executeQuery();
|
||||
|
||||
lsDadosRelatorio = new ArrayList<RelatorioResumoLinhasBean>();
|
||||
|
@ -218,7 +222,7 @@ public class RelatorioResumoLinhasAnaliticoSimplificadoSumarizado extends Relato
|
|||
sql.append(" AND co.feccorrida = bo.feccorrida ");
|
||||
sql.append(" AND bo.activo = 1 ");
|
||||
sql.append(" AND ( bo.motivocancelacion_id IS NULL ");
|
||||
sql.append(" OR bo.motivocancelacion_id = 0 ) ");
|
||||
sql.append(" OR bo.motivocancelacion_id = 0 AND bo.CATEGORIA_ID <> :CRIANCA_ID ) ");
|
||||
sql.append(" GROUP BY ");
|
||||
sql.append(" co.feccorrida, ");
|
||||
sql.append(" co.ruta_id, ");
|
||||
|
@ -345,7 +349,7 @@ public class RelatorioResumoLinhasAnaliticoSimplificadoSumarizado extends Relato
|
|||
sql.append(" AND vt.activo = 1 ");
|
||||
sql.append(" AND cr.feccorrida BETWEEN vt.feciniciovigencia AND vt.fecfinvigencia ");
|
||||
sql.append(" AND cr.feccorrida BETWEEN TO_DATE(:DATA_INICIAL, 'DD/MM/YY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, ");
|
||||
sql.append(" 'DD/MM/YY hh24:mi:ss') ");
|
||||
sql.append(" 'DD/MM/YY hh24:mi:ss') AND bl.CATEGORIA_ID <> :CRIANCA_ID ");
|
||||
sql.append(" AND cr.activo = 1 ");
|
||||
sql.append(" GROUP BY ");
|
||||
sql.append(" rt.ruta_id, ");
|
||||
|
@ -493,4 +497,8 @@ public class RelatorioResumoLinhasAnaliticoSimplificadoSumarizado extends Relato
|
|||
return relatorioBean;
|
||||
}
|
||||
|
||||
private String buscarConstante(String nomeConstante) {
|
||||
ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService");
|
||||
return constanteService.buscarPorNomeConstante(nomeConstante).getValorconstante();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -18,7 +18,9 @@ import java.util.Set;
|
|||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
|
||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
|
||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioResumoLinhasBean;
|
||||
import com.rjconsultores.ventaboletos.service.ConstanteService;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext;
|
||||
|
||||
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
|
||||
|
||||
|
@ -29,6 +31,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
|
|||
public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
|
||||
|
||||
private List<RelatorioResumoLinhasBean> lsDadosRelatorio;
|
||||
private static String CONSTANTE_GRATUIDADE_CRIANCA;
|
||||
|
||||
/**
|
||||
* @param parametros
|
||||
|
@ -43,7 +46,7 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
|
|||
Integer rutaId = parametros.get("RUTA_ID") != null ? Integer.valueOf(parametros.get("RUTA_ID").toString()) : null;
|
||||
Integer empresaId = parametros.get("EMPRESA_ID") != null ? Integer.valueOf(parametros.get("EMPRESA_ID").toString()) : null;
|
||||
Integer grupoRutaId = parametros.get("GRUPORUTA_ID") != null ? Integer.valueOf(parametros.get("GRUPORUTA_ID").toString()) : null;
|
||||
|
||||
CONSTANTE_GRATUIDADE_CRIANCA = buscarConstante("GRATUIDADE_CRIANCA");
|
||||
String sql = getSql(rutaId, grupoRutaId);
|
||||
|
||||
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
|
||||
|
@ -67,6 +70,7 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
|
|||
stmt.setInt("GRUPORUTA_ID", grupoRutaId);
|
||||
}
|
||||
stmt.setInt("EMPRESA_ID", empresaId.intValue());
|
||||
stmt.setString("CRIANCA_ID",CONSTANTE_GRATUIDADE_CRIANCA);
|
||||
rset = stmt.executeQuery();
|
||||
|
||||
lsDadosRelatorio = new ArrayList<RelatorioResumoLinhasBean>();
|
||||
|
@ -150,7 +154,7 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
|
|||
sqlSb.append(" AND CO.FECCORRIDA = BO.FECCORRIDA ");
|
||||
sqlSb.append(" AND BO.ACTIVO = 1 ");
|
||||
sqlSb.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL ");
|
||||
sqlSb.append(" OR BO.MOTIVOCANCELACION_ID = 0) ");
|
||||
sqlSb.append(" OR BO.MOTIVOCANCELACION_ID = 0 AND BO.CATEGORIA_ID <> :CRIANCA_ID ) ");
|
||||
sqlSb.append(" GROUP BY CO.FECCORRIDA, ");
|
||||
sqlSb.append(" CO.RUTA_ID, ");
|
||||
sqlSb.append(" BO.PRECIOBASE, ");
|
||||
|
@ -254,7 +258,7 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
|
|||
sqlSb.append(" AND RT.GRUPORUTA_ID = GR.GRUPORUTA_ID(+) ");
|
||||
sqlSb.append(" AND TR.ORIGEN_ID = CR.ORIGEN_ID ");
|
||||
sqlSb.append(" AND TR.DESTINO_ID = CR.DESTINO_ID ");
|
||||
sqlSb.append(" AND BL.MOTIVOCANCELACION_ID IS NULL ");
|
||||
sqlSb.append(" AND BL.MOTIVOCANCELACION_ID IS NULL AND BL.CATEGORIA_ID <> :CRIANCA_ID");
|
||||
sqlSb.append(" AND BL.INDSTATUSOPERACION = 'F' ");
|
||||
sqlSb.append(" AND VT.ACTIVO = 1 ");
|
||||
sqlSb.append(" AND CR.FECCORRIDA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ");
|
||||
|
@ -394,7 +398,10 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
|
|||
this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio));
|
||||
this.lsDadosRelatorio = lsDadosRelatorio;
|
||||
}
|
||||
|
||||
private String buscarConstante(String nomeConstante) {
|
||||
ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService");
|
||||
return constanteService.buscarPorNomeConstante(nomeConstante).getValorconstante();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
|
|
Binary file not shown.
|
@ -2,7 +2,7 @@
|
|||
<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="RelatorioResumoLinhasAnalitico" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
|
||||
<property name="ireport.zoom" value="2.000000000000002"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="57"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
|
||||
<style name="table">
|
||||
<box>
|
||||
|
@ -37,6 +37,7 @@
|
|||
<parameter name="GRUPORUTA_ID" class="java.lang.Integer"/>
|
||||
<parameter name="DATA" class="java.util.Date"/>
|
||||
<parameter name="NOME_USUARIO" class="java.lang.String"/>
|
||||
<parameter name="CRIANCA_ID" class="java.lang.String"/>
|
||||
<queryString>
|
||||
<![CDATA[SELECT TAB.*,
|
||||
ROUND((SELECT SUM((DECODE(NVL(TR.CANTKMREAL,0), 0, 1, NVL(TR.CANTKMREAL,0)) /
|
||||
|
@ -69,7 +70,7 @@
|
|||
CTD.NUMSECUENCIA
|
||||
AND BO.ACTIVO = 1
|
||||
AND (BO.MOTIVOCANCELACION_ID IS NULL OR
|
||||
BO.MOTIVOCANCELACION_ID = 0)
|
||||
BO.MOTIVOCANCELACION_ID = 0 AND BO.CATEGORIA_ID <> $P{CRIANCA_ID})
|
||||
GROUP BY CT.TRAMO_ID, TR.CANTKMREAL),
|
||||
2) * TAB.EXTENSAO_KM PAX_KM
|
||||
FROM (SELECT RT.INDSENTIDOIDA, CR.FECCORRIDA,
|
||||
|
@ -134,53 +135,53 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<groupHeader>
|
||||
<band height="31">
|
||||
<staticText>
|
||||
<reportElement uuid="9c579f27-ee14-4804-b73d-64994a6e41ec" x="0" y="18" width="50" height="11"/>
|
||||
<reportElement x="0" y="18" width="50" height="11" uuid="9c579f27-ee14-4804-b73d-64994a6e41ec"/>
|
||||
<textElement>
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<text><![CDATA[Data]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement uuid="7b8a8f38-e513-4a8c-a82b-a9c6ffd21f6f" x="111" y="18" width="64" height="11"/>
|
||||
<reportElement x="111" y="18" width="64" height="11" uuid="7b8a8f38-e513-4a8c-a82b-a9c6ffd21f6f"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<text><![CDATA[Passageiros]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526" x="224" y="17" width="42" height="11"/>
|
||||
<reportElement x="224" y="17" width="42" height="11" uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<text><![CDATA[Viagens]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement uuid="9e40c4ad-b386-4e8a-9d84-977a27bfebcc" mode="Opaque" x="0" y="2" width="30" height="12" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="0" y="2" width="30" height="12" backcolor="#CDCDCD" uuid="9e40c4ad-b386-4e8a-9d84-977a27bfebcc"/>
|
||||
<textElement verticalAlignment="Bottom">
|
||||
<font size="9" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Linha: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="afaaa1cf-1a3e-4a42-9fa3-e634a66fc3d3" x="0" y="1" width="554" height="1"/>
|
||||
<reportElement x="0" y="1" width="554" height="1" uuid="afaaa1cf-1a3e-4a42-9fa3-e634a66fc3d3"/>
|
||||
<graphicElement>
|
||||
<pen lineWidth="0.5"/>
|
||||
</graphicElement>
|
||||
</line>
|
||||
<line>
|
||||
<reportElement uuid="04a75f17-3686-484b-be43-7b7e22e9def7" x="0" y="16" width="554" height="1"/>
|
||||
<reportElement x="0" y="16" width="554" height="1" uuid="04a75f17-3686-484b-be43-7b7e22e9def7"/>
|
||||
<graphicElement>
|
||||
<pen lineWidth="0.5"/>
|
||||
</graphicElement>
|
||||
</line>
|
||||
<line>
|
||||
<reportElement uuid="d9f712d0-01a8-4241-a1e6-dc096b4ee773" x="0" y="30" width="554" height="1"/>
|
||||
<reportElement x="0" y="30" width="554" height="1" uuid="d9f712d0-01a8-4241-a1e6-dc096b4ee773"/>
|
||||
<graphicElement>
|
||||
<pen lineWidth="0.5"/>
|
||||
</graphicElement>
|
||||
</line>
|
||||
<staticText>
|
||||
<reportElement uuid="7b817589-f754-49f1-bf53-856be52946fb" mode="Transparent" x="313" y="18" width="65" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||
<reportElement mode="Transparent" x="313" y="18" width="65" height="11" forecolor="#000000" backcolor="#FFFFFF" uuid="7b817589-f754-49f1-bf53-856be52946fb"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -188,7 +189,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<text><![CDATA[KM Rodados]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement uuid="4e931a04-04b4-41b7-90c2-e66083daf0fe" mode="Transparent" x="417" y="18" width="98" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||
<reportElement mode="Transparent" x="417" y="18" width="98" height="11" forecolor="#000000" backcolor="#FFFFFF" uuid="4e931a04-04b4-41b7-90c2-e66083daf0fe"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -196,49 +197,49 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<text><![CDATA[PAX. KM]]></text>
|
||||
</staticText>
|
||||
<textField>
|
||||
<reportElement uuid="d97e582d-1e88-4841-8aa4-bc589f2a486a" mode="Opaque" x="28" y="2" width="184" height="12" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="28" y="2" width="184" height="12" backcolor="#CDCDCD" uuid="d97e582d-1e88-4841-8aa4-bc589f2a486a"/>
|
||||
<textElement verticalAlignment="Bottom">
|
||||
<font size="7"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{NUMRUTA}+" - "+$F{DESCRUTA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="a2466836-6444-4afd-95e0-b920d2514a9b" mode="Opaque" x="212" y="2" width="54" height="12" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="212" y="2" width="54" height="12" backcolor="#CDCDCD" uuid="a2466836-6444-4afd-95e0-b920d2514a9b"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Bottom">
|
||||
<font size="9" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Extensão: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="f4196d5c-5656-42cb-8f0e-c200044c844a" mode="Opaque" x="266" y="2" width="69" height="12" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="266" y="2" width="69" height="12" backcolor="#CDCDCD" uuid="f4196d5c-5656-42cb-8f0e-c200044c844a"/>
|
||||
<textElement verticalAlignment="Bottom">
|
||||
<font size="7"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[new java.text.DecimalFormat("###0.00").format($F{EXTENSAO_KM})]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="019480ff-577f-48a2-9bcc-984c592b308a" mode="Opaque" x="335" y="2" width="43" height="12" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="335" y="2" width="43" height="12" backcolor="#CDCDCD" uuid="019480ff-577f-48a2-9bcc-984c592b308a"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Bottom">
|
||||
<font size="9" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Empresa: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="8697043c-3c96-4ead-9a13-b22febaba3b5" mode="Opaque" x="378" y="2" width="95" height="12" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="378" y="2" width="95" height="12" backcolor="#CDCDCD" uuid="8697043c-3c96-4ead-9a13-b22febaba3b5"/>
|
||||
<textElement verticalAlignment="Bottom">
|
||||
<font size="7"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="14af2efb-fe6b-4be6-ae66-43a2ce8ed03a" mode="Opaque" x="473" y="2" width="42" height="12" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="473" y="2" width="42" height="12" backcolor="#CDCDCD" uuid="14af2efb-fe6b-4be6-ae66-43a2ce8ed03a"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Bottom">
|
||||
<font size="9" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Sentido: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="238edf00-2a59-4367-ab86-62aea2afd2ab" mode="Opaque" x="515" y="2" width="39" height="12" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="515" y="2" width="39" height="12" backcolor="#CDCDCD" uuid="238edf00-2a59-4367-ab86-62aea2afd2ab"/>
|
||||
<textElement verticalAlignment="Bottom">
|
||||
<font size="7"/>
|
||||
</textElement>
|
||||
|
@ -249,34 +250,34 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<groupFooter>
|
||||
<band height="20">
|
||||
<textField>
|
||||
<reportElement uuid="102eebb5-25f0-4175-ab9b-78fbca54bc06" x="111" y="1" width="64" height="13"/>
|
||||
<reportElement x="111" y="1" width="64" height="13" uuid="102eebb5-25f0-4175-ab9b-78fbca54bc06"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{PASSAGEIROS_1}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="9f6ea621-a236-429f-bb13-ae57118ff5b3" x="224" y="0" width="42" height="12"/>
|
||||
<reportElement x="224" y="0" width="42" height="12" uuid="9f6ea621-a236-429f-bb13-ae57118ff5b3"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{VIAGENS_1}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="422ef3af-efca-47b0-80ba-16120724ca36" x="0" y="0" width="554" height="1"/>
|
||||
<reportElement x="0" y="0" width="554" height="1" uuid="422ef3af-efca-47b0-80ba-16120724ca36"/>
|
||||
<graphicElement>
|
||||
<pen lineWidth="0.5"/>
|
||||
</graphicElement>
|
||||
</line>
|
||||
<textField pattern="#,##0.00">
|
||||
<reportElement uuid="3a2d351f-134e-43d6-acea-e3556fc61897" x="313" y="2" width="65" height="12"/>
|
||||
<reportElement x="313" y="2" width="65" height="12" uuid="3a2d351f-134e-43d6-acea-e3556fc61897"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{EXTENSAO_1}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="false">
|
||||
<reportElement uuid="7fc513ea-f587-433c-88fa-6357bdb9ed55" mode="Transparent" x="417" y="2" width="98" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||
<reportElement mode="Transparent" x="417" y="2" width="98" height="12" forecolor="#000000" backcolor="#FFFFFF" uuid="7fc513ea-f587-433c-88fa-6357bdb9ed55"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -284,7 +285,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$V{PAX_KM_1}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement uuid="984a2f82-b446-4dc7-8202-0d092824ee4d" x="0" y="1" width="50" height="11"/>
|
||||
<reportElement x="0" y="1" width="50" height="11" uuid="984a2f82-b446-4dc7-8202-0d092824ee4d"/>
|
||||
<textElement>
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
|
@ -299,7 +300,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<pageHeader>
|
||||
<band height="66" splitType="Stretch">
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="2ed4524d-5c06-487c-a8f1-abc59a8ef7fc" mode="Opaque" x="0" y="21" width="443" height="15" forecolor="#000000" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="0" y="21" width="443" height="15" forecolor="#000000" backcolor="#CDCDCD" uuid="2ed4524d-5c06-487c-a8f1-abc59a8ef7fc"/>
|
||||
<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"/>
|
||||
|
@ -307,7 +308,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="fc199edd-4f2f-4b5f-9397-44f4af50a920" mode="Opaque" x="0" y="36" width="50" height="15" forecolor="#000000" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="0" y="36" width="50" height="15" forecolor="#000000" backcolor="#CDCDCD" uuid="fc199edd-4f2f-4b5f-9397-44f4af50a920"/>
|
||||
<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"/>
|
||||
|
@ -315,7 +316,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
|
||||
<reportElement uuid="f64c2e3c-d936-4072-a0b1-d914f408bbbb" mode="Opaque" x="50" y="36" width="61" height="15" forecolor="#000000" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="50" y="36" width="61" height="15" forecolor="#000000" backcolor="#CDCDCD" uuid="f64c2e3c-d936-4072-a0b1-d914f408bbbb"/>
|
||||
<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"/>
|
||||
|
@ -323,7 +324,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
|
||||
<reportElement uuid="00093c35-d3a5-4b0e-8a7a-26a86912dd25" mode="Opaque" x="111" y="36" width="332" height="15" forecolor="#000000" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="111" y="36" width="332" height="15" forecolor="#000000" backcolor="#CDCDCD" uuid="00093c35-d3a5-4b0e-8a7a-26a86912dd25"/>
|
||||
<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"/>
|
||||
|
@ -331,7 +332,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="def1b81c-a286-4749-9ef7-f90984a3a5eb" mode="Transparent" x="101" y="36" width="10" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||
<reportElement mode="Transparent" x="101" y="36" width="10" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="def1b81c-a286-4749-9ef7-f90984a3a5eb"/>
|
||||
<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"/>
|
||||
|
@ -339,7 +340,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$R{cabecalho.periodoA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="5dfea5f4-257a-43bc-94cb-bdead81ef7ac" mode="Opaque" x="0" y="0" width="417" height="21" forecolor="#000000" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="0" y="0" width="417" height="21" forecolor="#000000" backcolor="#CDCDCD" uuid="5dfea5f4-257a-43bc-94cb-bdead81ef7ac"/>
|
||||
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -347,7 +348,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
|
||||
<reportElement uuid="ea4dfc22-27b5-4600-8e8b-7d74460ed744" mode="Opaque" x="463" y="0" width="92" height="21" forecolor="#000000" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="463" y="0" width="92" height="21" forecolor="#000000" backcolor="#CDCDCD" uuid="ea4dfc22-27b5-4600-8e8b-7d74460ed744"/>
|
||||
<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"/>
|
||||
|
@ -355,14 +356,14 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="a46c91f5-fb60-48d8-93c1-3814ce0160dd" mode="Opaque" x="417" y="0" width="46" height="21" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="417" y="0" width="46" height="21" backcolor="#CDCDCD" uuid="a46c91f5-fb60-48d8-93c1-3814ce0160dd"/>
|
||||
<textElement>
|
||||
<font size="9" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="623b5d82-e7b3-4439-96c5-f44833fb8864" mode="Opaque" x="417" y="34" width="138" height="17" forecolor="#000000" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="417" y="34" width="138" height="17" forecolor="#000000" backcolor="#CDCDCD" uuid="623b5d82-e7b3-4439-96c5-f44833fb8864"/>
|
||||
<textElement 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"/>
|
||||
|
@ -370,7 +371,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}+"-"+$P{NOME_USUARIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="ccec8b66-ed79-418b-b66d-15d9ed3bf2ce" mode="Opaque" x="0" y="51" width="50" height="15" forecolor="#000000" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="0" y="51" width="50" height="15" forecolor="#000000" backcolor="#CDCDCD" uuid="ccec8b66-ed79-418b-b66d-15d9ed3bf2ce"/>
|
||||
<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"/>
|
||||
|
@ -378,14 +379,14 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$R{cabecalho.filtros}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="98fc1c7e-3fee-4c70-924f-2cbb17fd243f" mode="Opaque" x="50" y="51" width="505" height="15" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="50" y="51" width="505" height="15" backcolor="#CDCDCD" uuid="98fc1c7e-3fee-4c70-924f-2cbb17fd243f"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="6aae4c9b-2e2a-4fd5-9115-760449d3c263" mode="Opaque" x="417" y="21" width="125" height="13" forecolor="#000000" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="417" y="21" width="125" height="13" forecolor="#000000" backcolor="#CDCDCD" uuid="6aae4c9b-2e2a-4fd5-9115-760449d3c263"/>
|
||||
<textElement 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"/>
|
||||
|
@ -393,7 +394,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
|
||||
<reportElement uuid="5a57c3a1-ed8e-46fb-836f-d250116a238a" mode="Opaque" x="542" y="21" width="13" height="13" forecolor="#000000" backcolor="#CDCDCD"/>
|
||||
<reportElement mode="Opaque" x="542" y="21" width="13" height="13" forecolor="#000000" backcolor="#CDCDCD" uuid="5a57c3a1-ed8e-46fb-836f-d250116a238a"/>
|
||||
<textElement textAlignment="Center" 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"/>
|
||||
|
@ -405,21 +406,21 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<detail>
|
||||
<band height="13">
|
||||
<textField pattern="dd/MM/yyyy">
|
||||
<reportElement uuid="ee9c23bd-e562-43d1-a766-851d09848504" x="0" y="0" width="50" height="12"/>
|
||||
<reportElement x="0" y="0" width="50" height="12" uuid="ee9c23bd-e562-43d1-a766-851d09848504"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{FECCORRIDA}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="9557122b-0661-4f5e-9a89-b0bfd74dabe3" x="111" y="0" width="64" height="12"/>
|
||||
<reportElement x="111" y="0" width="64" height="12" uuid="9557122b-0661-4f5e-9a89-b0bfd74dabe3"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{PASSAGEIROS}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00" isBlankWhenNull="false">
|
||||
<reportElement uuid="beb097c0-f4c1-4fe3-a62e-badfdf823c0c" mode="Transparent" x="417" y="0" width="98" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
|
||||
<reportElement mode="Transparent" x="417" y="0" width="98" height="12" forecolor="#000000" backcolor="#FFFFFF" uuid="beb097c0-f4c1-4fe3-a62e-badfdf823c0c"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
|
||||
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
|
||||
<paragraph lineSpacing="Single"/>
|
||||
|
@ -427,14 +428,14 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<textFieldExpression><![CDATA[$F{PAX_KM}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00">
|
||||
<reportElement uuid="21f73b7d-c377-4047-9960-41e085463aa0" x="313" y="1" width="65" height="12"/>
|
||||
<reportElement x="313" y="1" width="65" height="12" uuid="21f73b7d-c377-4047-9960-41e085463aa0"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{VIAGENS}.multiply($F{EXTENSAO_KM})]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="01a234c4-7c30-4ac3-9a7c-dc09d0ebe314" x="224" y="1" width="42" height="12"/>
|
||||
<reportElement x="224" y="1" width="42" height="12" uuid="01a234c4-7c30-4ac3-9a7c-dc09d0ebe314"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
|
@ -445,7 +446,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
|
|||
<noData>
|
||||
<band height="39">
|
||||
<textField>
|
||||
<reportElement uuid="a640c0eb-ead8-4a2a-bda4-675165e8bc7d" x="0" y="8" width="555" height="20"/>
|
||||
<reportElement x="0" y="8" width="555" height="20" uuid="a640c0eb-ead8-4a2a-bda4-675165e8bc7d"/>
|
||||
<textElement textAlignment="Center" markup="none">
|
||||
<font size="11" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -31,6 +31,7 @@ import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioResumoLinhasAnali
|
|||
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioResumoLinhasAnaliticoSimplificadoSumarizado;
|
||||
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioResumoLinhasAnaliticoSumarizado;
|
||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
|
||||
import com.rjconsultores.ventaboletos.service.ConstanteService;
|
||||
import com.rjconsultores.ventaboletos.service.EmpresaService;
|
||||
import com.rjconsultores.ventaboletos.service.GrupoRutaService;
|
||||
import com.rjconsultores.ventaboletos.service.RutaService;
|
||||
|
@ -38,6 +39,7 @@ import com.rjconsultores.ventaboletos.utilerias.DateUtil;
|
|||
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
|
||||
import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -70,6 +72,7 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer {
|
|||
private Radio rdAnalitico;
|
||||
private Checkbox chcSumarizar;
|
||||
private Checkbox chcSimplificadoSumarizado;
|
||||
private static String CONSTANTE_GRATUIDADE_CRIANCA;
|
||||
|
||||
|
||||
|
||||
|
@ -93,6 +96,7 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer {
|
|||
parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioResumoLinhasController.window.title"));
|
||||
parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
|
||||
parametros.put("NOME_USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario());
|
||||
parametros.put("CRIANCA_ID", buscarConstante("GRATUIDADE_CRIANCA"));
|
||||
|
||||
Comboitem itemRuta = cmbRuta.getSelectedItem();
|
||||
|
||||
|
@ -160,6 +164,11 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer {
|
|||
super.doAfterCompose(comp);
|
||||
}
|
||||
|
||||
private String buscarConstante(String nomeConstante) {
|
||||
ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService");
|
||||
return constanteService.buscarPorNomeConstante(nomeConstante).getValorconstante();
|
||||
}
|
||||
|
||||
public List<Ruta> getLsRuta() {
|
||||
return lsRuta;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue