- Finalização relatório RAE

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29767 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java

@@ -81,21 +81,18 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
 			@Override
 			public void initDados() throws Exception {
 
-
 				this.prepareQuery();
 
 				Date dataInicial = (Date) this.relatorio.getParametros().get("DATA_MES");
 
 				while (this.resultSet.next()) {
 
-
 					Integer rolOperativoId = this.resultSet.getInt("ROLOPERATIVO_ID");
 					Integer corridaId = this.resultSet.getInt("CORRIDA_ID");
 					Map<String, Object> row = new HashMap<String, Object>();
 					BigDecimal totalMes = BigDecimal.ZERO;
 					Integer totalDias = 0;
 
-
 					row.put("LINHA", this.resultSet.getString("SIGLA"));
 					row.put("LOTACAO", this.resultSet.getInt("ASSENTOS"));
 					row.put("SERVICO", this.resultSet.getString("TIPO_SERVICO"));
@@ -125,7 +122,6 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
 
 					}
 
-					System.out.println("Total mes "+totalMes+ "Total dias"+ totalDias);
 					if (totalMes != null && !totalMes.equals(BigDecimal.ZERO) && totalDias > 0)
 						row.put("MEDIA", totalMes.divide(BigDecimal.valueOf(totalDias), 2, RoundingMode.HALF_UP));
 
@@ -141,24 +137,25 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
 
 				switch (IndicadorRelatorio.fromInt(indicador)) {
 				case MPE:
+					sql = getSqlIndicadorEquivalentes();
 					break;
 				case ABSOLUTO:
 					sql = getSqlIndicadorAbsoluto();
 					break;
 				case EQ:
-
+					sql = getSqlIndicadorEq();
 					break;
 				case IAP:
-
+					sql = getSqlIndicadorIap();
 					break;
 				case PAXKM:
-
+					sql = getSqlIndicadorPax();
 					break;
 				case RECEITA_KM:
-
+					sql = getSqlIndicadorReceitaKm();
 					break;
 				case RECEITA_VIAGEM:
-
+					sql = getSqlIndicadorReceitaViagem();
 					break;
 				}
 
@@ -168,6 +165,227 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
 		});
 	}
 
+	protected String getSqlIndicadorEq() {
+		StringBuilder sql = new StringBuilder();
+		sql.append(" SELECT ROUND((SELECT TF.PRECIO");
+		sql.append("                 FROM CORRIDA CR, TRAMO TR, TARIFA TF, VIGENCIA_TARIFA VT");
+		sql.append("                WHERE CR.CORRIDA_ID = :CORRIDA_ID");
+		sql.append("                  AND CR.FECCORRIDA = :FECCORRIDA");
+		sql.append("                  AND TF.CLASESERVICIO_ID = CR.CLASESERVICIO_ID");
+		sql.append("                  AND TF.MARCA_ID = CR.MARCA_ID");
+		sql.append("                  AND TF.RUTA_ID = CR.RUTA_ID");
+		sql.append("                  AND TF.TRAMO_ID = TR.TRAMO_ID");
+		sql.append("                  AND TF.STATUSTARIFA = 'A'");
+		sql.append("                  AND TF.ACTIVO = 1");
+		sql.append("                  AND TR.ORIGEN_ID = CR.ORIGEN_ID");
+		sql.append("                  AND TR.DESTINO_ID = CR.DESTINO_ID");
+		sql.append("                  AND TF.VIGENCIATARIFA_ID = VT.VIGENCIATARIFA_ID");
+		sql.append("                  AND VT.ACTIVO = 1");
+		sql.append("                  AND CR.FECCORRIDA BETWEEN VT.FECINICIOVIGENCIA AND");
+		sql.append("                      VT.FECFINVIGENCIA) /");
+		sql.append("              (SELECT SUM(BO.PRECIOPAGADO + BO.IMPORTEPEDAGIO +");
+		sql.append("                          BO.IMPORTESEGURO + BO.IMPORTETAXAEMBARQUE) RECEITA");
+		sql.append("                 FROM BOLETO BO");
+		sql.append("                WHERE BO.CORRIDA_ID = :CORRIDA_ID");
+		sql.append("                  AND BO.FECCORRIDA = :FECCORRIDA");
+		sql.append("                  AND BO.ACTIVO = 1");
+		sql.append("                  AND BO.INDREIMPRESION = 0");
+		sql.append("                  AND BO.INDSTATUSOPERACION = 'F'");
+		sql.append("                  AND (BO.MOTIVOCANCELACION_ID IS NULL OR");
+		sql.append("                      BO.MOTIVOCANCELACION_ID = 0)),");
+		sql.append("              0) VALOR");
+		sql.append("   FROM DUAL");
+
+		return sql.toString();
+	}
+
+	protected String getSqlIndicadorPax() {
+		StringBuilder sql = new StringBuilder();
+		sql.append("    SELECT (TAB1.EQUIVALENTE * TAB1.EXTENSAO_LINHA) ");
+		sql.append("              VALOR");
+		sql.append("        FROM (SELECT TAB.*,");
+		sql.append("                     (SELECT SUM((TR.CANTKMREAL / TAB.EXTENSAO_LINHA) *");
+		sql.append("                                 COUNT(1))");
+		sql.append("                        FROM CORRIDA       CR,");
+		sql.append("                             CORRIDA_TRAMO CT,");
+		sql.append("                             TRAMO         TR,");
+		sql.append("                             BOLETO        BO,");
+		sql.append("                             CORRIDA_TRAMO CTD,");
+		sql.append("                             CORRIDA_TRAMO CTO");
+		sql.append("                       WHERE CR.CORRIDA_ID = :CORRIDA_ID");
+		sql.append("                         AND CR.FECCORRIDA = :FECCORRIDA");
+		sql.append("                         AND CT.FECCORRIDA = CR.FECCORRIDA");
+		sql.append("                         AND CT.CORRIDA_ID = CR.CORRIDA_ID");
+		sql.append("                         AND TR.TRAMO_ID = CT.TRAMO_ID");
+		sql.append("                         AND BO.CORRIDA_ID = CT.CORRIDA_ID");
+		sql.append("                         AND BO.FECCORRIDA = CT.FECCORRIDA");
+		sql.append("                         AND BO.ORIGEN_ID = CTO.ORIGEN_ID");
+		sql.append("                         AND BO.DESTINO_ID = CTD.DESTINO_ID");
+		sql.append("                         AND CTD.CORRIDA_ID = CT.CORRIDA_ID");
+		sql.append("                         AND CTD.FECCORRIDA = CT.FECCORRIDA");
+		sql.append("                         AND CTO.CORRIDA_ID = CT.CORRIDA_ID");
+		sql.append("                         AND CTO.FECCORRIDA = CT.FECCORRIDA");
+		sql.append("                         AND CTO.ACTIVO = 1");
+		sql.append("                         AND CTD.ACTIVO = 1");
+		sql.append("                         AND CT.NUMSECUENCIA BETWEEN CTO.NUMSECUENCIA AND");
+		sql.append("                             CTD.NUMSECUENCIA");
+		sql.append("                         AND BO.ACTIVO = 1");
+		sql.append("                         AND BO.INDREIMPRESION = 0");
+		sql.append("                         AND BO.INDSTATUSOPERACION = 'F'");
+		sql.append("                         AND (BO.MOTIVOCANCELACION_ID IS NULL OR");
+		sql.append("                             BO.MOTIVOCANCELACION_ID = 0)");
+		sql.append("                       GROUP BY CT.TRAMO_ID, TR.CANTKMREAL) EQUIVALENTE");
+		sql.append("                FROM (SELECT (SELECT SUM(TR1.CANTKMREAL)");
+		sql.append("                                FROM CORRIDA_TRAMO CT1, TRAMO TR1");
+		sql.append("                               WHERE CT1.CORRIDA_ID = :CORRIDA_ID");
+		sql.append("                                 AND CT1.FECCORRIDA = :FECCORRIDA");
+		sql.append("                                 AND TR1.TRAMO_ID = CT1.TRAMO_ID) EXTENSAO_LINHA");
+		sql.append("                      ");
+		sql.append("                        FROM DUAL) TAB) TAB1");
+
+		return sql.toString();
+
+	}
+
+	protected String getSqlIndicadorIap() {
+		StringBuilder sql = new StringBuilder();
+		sql.append("    SELECT (TAB1.EQUIVALENTE * TAB1.EXTENSAO_LINHA) /");
+		sql.append("              (TAB1.CAPACIDADE * TAB1.EXTENSAO_LINHA) VALOR");
+		sql.append("        FROM (SELECT TAB.*,");
+		sql.append("                     (SELECT SUM((TR.CANTKMREAL / TAB.EXTENSAO_LINHA) *");
+		sql.append("                                 COUNT(1))");
+		sql.append("                        FROM CORRIDA       CR,");
+		sql.append("                             CORRIDA_TRAMO CT,");
+		sql.append("                             TRAMO         TR,");
+		sql.append("                             BOLETO        BO,");
+		sql.append("                             CORRIDA_TRAMO CTD,");
+		sql.append("                             CORRIDA_TRAMO CTO");
+		sql.append("                       WHERE CR.CORRIDA_ID = :CORRIDA_ID");
+		sql.append("                         AND CR.FECCORRIDA = :FECCORRIDA");
+		sql.append("                         AND CT.FECCORRIDA = CR.FECCORRIDA");
+		sql.append("                         AND CT.CORRIDA_ID = CR.CORRIDA_ID");
+		sql.append("                         AND TR.TRAMO_ID = CT.TRAMO_ID");
+		sql.append("                         AND BO.CORRIDA_ID = CT.CORRIDA_ID");
+		sql.append("                         AND BO.FECCORRIDA = CT.FECCORRIDA");
+		sql.append("                         AND BO.ORIGEN_ID = CTO.ORIGEN_ID");
+		sql.append("                         AND BO.DESTINO_ID = CTD.DESTINO_ID");
+		sql.append("                         AND CTD.CORRIDA_ID = CT.CORRIDA_ID");
+		sql.append("                         AND CTD.FECCORRIDA = CT.FECCORRIDA");
+		sql.append("                         AND CTO.CORRIDA_ID = CT.CORRIDA_ID");
+		sql.append("                         AND CTO.FECCORRIDA = CT.FECCORRIDA");
+		sql.append("                         AND CTO.ACTIVO = 1");
+		sql.append("                         AND CTD.ACTIVO = 1");
+		sql.append("                         AND CT.NUMSECUENCIA BETWEEN CTO.NUMSECUENCIA AND");
+		sql.append("                             CTD.NUMSECUENCIA");
+		sql.append("                         AND BO.ACTIVO = 1");
+		sql.append("                         AND BO.INDREIMPRESION = 0");
+		sql.append("                         AND BO.INDSTATUSOPERACION = 'F'");
+		sql.append("                         AND (BO.MOTIVOCANCELACION_ID IS NULL OR");
+		sql.append("                             BO.MOTIVOCANCELACION_ID = 0)");
+		sql.append("                       GROUP BY CT.TRAMO_ID, TR.CANTKMREAL) EQUIVALENTE");
+		sql.append("                FROM (SELECT (SELECT SUM(TR1.CANTKMREAL)");
+		sql.append("                                FROM CORRIDA_TRAMO CT1, TRAMO TR1");
+		sql.append("                               WHERE CT1.CORRIDA_ID = :CORRIDA_ID");
+		sql.append("                                 AND CT1.FECCORRIDA = :FECCORRIDA");
+		sql.append("                                 AND TR1.TRAMO_ID = CT1.TRAMO_ID) EXTENSAO_LINHA,");
+		sql.append("                             ");
+		sql.append("                             (SELECT DA.CANTASIENTOS");
+		sql.append("                                FROM CORRIDA          CR,");
+		sql.append("                                     ROL_OPERATIVO    RO,");
+		sql.append("                                     DIAGRAMA_AUTOBUS DA");
+		sql.append("                               WHERE CR.CORRIDA_ID = :CORRIDA_ID");
+		sql.append("                                 AND CR.FECCORRIDA = :FECCORRIDA");
+		sql.append("                                 AND RO.ROLOPERATIVO_ID = CR.ROLOPERATIVO_ID");
+		sql.append("                                 AND RO.DIAGRAMAAUTOBUS_ID =");
+		sql.append("                                     DA.DIAGRAMAAUTOBUS_ID) CAPACIDADE");
+		sql.append("                      ");
+		sql.append("                        FROM DUAL) TAB) TAB1");
+
+		return sql.toString();
+
+	}
+
+	protected String getSqlIndicadorReceitaKm() {
+		StringBuilder sql = new StringBuilder();
+		sql.append(" SELECT (RECEITA / (SELECT SUM(TR1.CANTKMREAL) ");
+		sql.append(" FROM CORRIDA_TRAMO CT1, TRAMO TR1 ");
+		sql.append(" WHERE CT1.CORRIDA_ID = :CORRIDA_ID ");
+		sql.append("   AND CT1.FECCORRIDA = :FECCORRIDA ");
+		sql.append("   AND TR1.TRAMO_ID = CT1.TRAMO_ID)) VALOR ");
+		sql.append(" FROM (SELECT SUM(BO.PRECIOPAGADO + BO.IMPORTEPEDAGIO + BO.IMPORTESEGURO + ");
+		sql.append("    BO.IMPORTETAXAEMBARQUE) RECEITA ");
+		sql.append(" FROM BOLETO BO ");
+		sql.append(" WHERE BO.CORRIDA_ID = :CORRIDA_ID ");
+		sql.append(" AND BO.FECCORRIDA = :FECCORRIDA ");
+		sql.append(" AND BO.ACTIVO = 1 ");
+		sql.append(" AND BO.INDREIMPRESION = 0 ");
+		sql.append(" AND BO.INDSTATUSOPERACION = 'F' ");
+		sql.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL OR ");
+		sql.append("  BO.MOTIVOCANCELACION_ID = 0)) RC ");
+
+		return sql.toString();
+
+	}
+
+	protected String getSqlIndicadorReceitaViagem() {
+		StringBuilder sql = new StringBuilder();
+
+		sql.append("SELECT SUM(BO.PRECIOPAGADO + BO.IMPORTEPEDAGIO + BO.IMPORTESEGURO + ");
+		sql.append("    BO.IMPORTETAXAEMBARQUE) VALOR  ");
+		sql.append(" FROM BOLETO BO ");
+		sql.append(" WHERE BO.CORRIDA_ID = :CORRIDA_ID ");
+		sql.append(" AND BO.FECCORRIDA = :FECCORRIDA ");
+		sql.append(" AND BO.ACTIVO = 1 ");
+		sql.append(" AND BO.INDREIMPRESION = 0 ");
+		sql.append(" AND BO.INDSTATUSOPERACION = 'F' ");
+		sql.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL OR ");
+		sql.append("  BO.MOTIVOCANCELACION_ID = 0) ");
+
+		return sql.toString();
+
+	}
+
+	protected String getSqlIndicadorEquivalentes() {
+		/* O calculo do MPE não leva em consideração a quantidade de viagens conforme formula, uma vez que o detalhemtno do relatório já é por viagem */
+		StringBuilder sql = new StringBuilder();
+		sql.append(" SELECT SUM((TR.CANTKMREAL/EL.EXTENSAO_LINHA ) * COUNT(1)) VALOR ");
+		sql.append("   FROM CORRIDA CR, ");
+		sql.append("        CORRIDA_TRAMO CT, ");
+		sql.append("        TRAMO TR, ");
+		sql.append("        BOLETO BO, ");
+		sql.append("        CORRIDA_TRAMO CTD, ");
+		sql.append("        CORRIDA_TRAMO CTO, ");
+		sql.append("        (SELECT SUM(TR1.CANTKMREAL) EXTENSAO_LINHA ");
+		sql.append("           FROM CORRIDA_TRAMO CT1, TRAMO TR1 ");
+		sql.append("          WHERE CT1.CORRIDA_ID = :CORRIDA_ID  ");
+		sql.append("            AND CT1.FECCORRIDA = :FECCORRIDA  ");
+		sql.append("            AND TR1.TRAMO_ID = CT1.TRAMO_ID) EL ");
+		sql.append("  WHERE CR.CORRIDA_ID = :CORRIDA_ID ");
+		sql.append("    AND CR.FECCORRIDA = :FECCORRIDA   ");
+		sql.append("    AND CT.FECCORRIDA = CR.FECCORRIDA ");
+		sql.append("    AND CT.CORRIDA_ID = CR.CORRIDA_ID ");
+		sql.append("    AND TR.TRAMO_ID = CT.TRAMO_ID ");
+		sql.append("    AND BO.CORRIDA_ID = CT.CORRIDA_ID ");
+		sql.append("    AND BO.FECCORRIDA = CT.FECCORRIDA ");
+		sql.append("    AND BO.ORIGEN_ID = CTO.ORIGEN_ID ");
+		sql.append("    AND BO.DESTINO_ID = CTD.DESTINO_ID ");
+		sql.append("    AND CTD.CORRIDA_ID = CT.CORRIDA_ID ");
+		sql.append("    AND CTD.FECCORRIDA = CT.FECCORRIDA ");
+		sql.append("    AND CTO.CORRIDA_ID = CT.CORRIDA_ID ");
+		sql.append("    AND CTO.FECCORRIDA = CT.FECCORRIDA ");
+		sql.append("    AND CTO.ACTIVO = 1 ");
+		sql.append("    AND CTD.ACTIVO = 1 ");
+		sql.append("    AND CT.NUMSECUENCIA BETWEEN CTO.NUMSECUENCIA AND CTD.NUMSECUENCIA ");
+		sql.append("    AND BO.ACTIVO = 1 ");
+		sql.append("    AND BO.INDREIMPRESION = 0 ");
+		sql.append("    AND BO.INDSTATUSOPERACION = 'F' ");
+		sql.append("    AND (BO.MOTIVOCANCELACION_ID IS NULL OR BO.MOTIVOCANCELACION_ID = 0) ");
+		sql.append("  GROUP BY CT.TRAMO_ID, TR.CANTKMREAL, EL.EXTENSAO_LINHA ");
+
+		return sql.toString();
+
+	}
+
 	protected String getSqlIndicadorAbsoluto() {
 
 		StringBuilder sql = new StringBuilder();

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAcompanhamentoEquivalentes_pt_BR.properties

@@ -0,0 +1,8 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.relatorio=Relatório:
+cabecalho.servico=Serviço:
+cabecalho.data=Data:
+

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml

@@ -1,8 +1,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="RelatorioResumoLinhas" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="2.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="634"/>
-	<property name="ireport.y" value="1"/>
+	<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>
@@ -28,6 +28,7 @@
 	<parameter name="EMPRESA" class="java.lang.String"/>
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
 	<parameter name="EMPRESA_ID" class="java.lang.Integer"/>
+	<parameter name="INDICADOR_NOME" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[SELECT 1 FROM DUAL]]>
 	</queryString>
@@ -126,21 +127,21 @@
 				<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="MM/yyyy" isBlankWhenNull="false">
-				<reportElement uuid="4408d1db-05db-4538-944d-5561074f2706" mode="Transparent" x="66" y="60" width="53" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="4408d1db-05db-4538-944d-5561074f2706" mode="Transparent" x="50" y="60" width="78" height="15" 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><![CDATA[$P{DATA_MES}]]></textFieldExpression>
 			</textField>
-			<textField pattern="" isBlankWhenNull="false">
+			<staticText>
-				<reportElement uuid="c714d8a2-a41a-4fc8-848c-9cb455c3a0c7" mode="Transparent" x="1" y="60" width="65" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="8109cd1c-5c2f-41f2-ab03-0f92e7e36f15" mode="Transparent" x="1" y="60" width="49" height="15" 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><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression>
+				<text><![CDATA[Mês/Ano:]]></text>
-			</textField>
+			</staticText>
 			<textField>
 				<reportElement uuid="e5254cd0-647f-4b22-be4c-cce9afc5a10f" x="669" y="40" width="100" height="20"/>
 				<textElement textAlignment="Right">
@@ -158,6 +159,13 @@
 			<line>
 				<reportElement uuid="afaaa1cf-1a3e-4a42-9fa3-e634a66fc3d3" x="1" y="76" width="797" height="1"/>
 			</line>
+			<textField>
+				<reportElement uuid="4f103585-10c9-4ec5-83e3-40076b812270" x="669" y="60" width="100" height="15"/>
+				<textElement textAlignment="Right">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{INDICADOR_NOME}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>
@@ -176,13 +184,13 @@
 				<text><![CDATA[Lot.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="bcaa405e-87c5-44b3-91b0-473a9d5d232d" x="40" y="19" width="22" height="9"/>
+				<reportElement uuid="bcaa405e-87c5-44b3-91b0-473a9d5d232d" x="40" y="19" width="10" height="9"/>
 				<textElement/>
-				<text><![CDATA[Serviço]]></text>
+				<text><![CDATA[Ser.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="db4d2cdf-6182-4ed4-88fb-793f2df5f819" x="62" y="19" width="22" height="9"/>
+				<reportElement uuid="db4d2cdf-6182-4ed4-88fb-793f2df5f819" x="50" y="19" width="34" height="9"/>
-				<textElement/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[Código]]></text>
 			</staticText>
 			<staticText>
@@ -513,9 +521,7 @@
 				<text><![CDATA[26]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="2bae6074-292b-43d3-9b6c-24ad69ddf4f6" x="758" y="19" width="40" height="9">
+				<reportElement uuid="2bae6074-292b-43d3-9b6c-24ad69ddf4f6" x="758" y="19" width="40" height="9"/>
-					<printWhenExpression><![CDATA[new GregorianCalendar($P{DATA_MES}.getYear(), $P{DATA_MES}.getMonth(), $P{DATA_MES}.getDate()).getActualMaximum(Calendar.DAY_OF_MONTH) > 30]]></printWhenExpression>
-				</reportElement>
 				<textElement textAlignment="Right"/>
 				<text><![CDATA[Média]]></text>
 			</staticText>
@@ -699,14 +705,14 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{LOTACAO}]]></textFieldExpression>
 			</textField>
-			<textField pattern="" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="a4711633-73ff-4154-8b02-0b2e107cbbb4" x="40" y="0" width="22" height="9"/>
+				<reportElement uuid="a4711633-73ff-4154-8b02-0b2e107cbbb4" x="40" y="0" width="10" height="9"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{SERVICO}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{SERVICO}.substring(0,1)]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="e77668a8-4828-4581-a0d6-6a8301d07573" x="62" y="0" width="22" height="9"/>
+				<reportElement uuid="e77668a8-4828-4581-a0d6-6a8301d07573" x="50" y="0" width="34" height="9"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{CODIGO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAcompanhamentoEquivalentesController.java

@@ -75,6 +75,7 @@ public class RelatorioAcompanhamentoEquivalentesController extends MyGenericForw
 		parametros.put("DATA_MES", (java.util.Date) this.datMes.getValue());
 		parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioAcompanhamentoEquivalentesController.window.title"));
 		parametros.put("INDICADOR", Integer.parseInt(rdGroupIndicador.getSelectedItem().getValue()));
+		parametros.put("INDICADOR_NOME", rdGroupIndicador.getSelectedItem().getLabel());
 	
 
 		Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
@@ -84,7 +85,7 @@ public class RelatorioAcompanhamentoEquivalentesController extends MyGenericForw
 			parametros.put("EMPRESA", empresa.getNombempresa());
 		}
 
-		if(!rdGroupServico.getSelectedItem().getValue().equals("-1"))
+		if(rdGroupServico.getSelectedItem()!= null && !rdGroupServico.getSelectedItem().getValue().equals("-1"))
 			parametros.put("TIPOSERVICIO_ID",  Integer.parseInt(rdGroupServico.getSelectedItem().getValue()));
 			
 

web/gui/relatorios/filtroRelatorioAcompanhamentoEquivalentes.zul

@@ -48,6 +48,7 @@
 									<row>
 										<radio
 											radiogroup="rdGroupIndicador" value="1"
+											checked="true"
 											label="${c:l('relatorioAcompanhamentoEquivalentesController.lbIndicador.mpe.value')}" />
 										<radio
 											radiogroup="rdGroupIndicador" value="2"
@@ -100,6 +101,7 @@
 									<row>
 										<radio
 											radiogroup="rdGroupServico" value="-1"
+											checked="true"
 											label="${c:l('relatorioAcompanhamentoEquivalentesController.lbTipoServico.todos.value')}" />
 									</row>
 								</rows>