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

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

master
marcus 2013-10-15 20:25:22 +00:00
parent a142b163d0
commit 849673fca1
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhaOperacional.java
View File

@ -88,9 +88,7 @@ public class RelatorioLinhaOperacional extends Relatorio {
sql.append(" TO_CHAR(fechorventa, 'yyyy') fechorventa ");
}
sql.append(" FROM boleto ");
sql.append(" WHERE fechorventa BETWEEN To_date('").append(dataDe).append("', 'dd/mm/yyyy HH24:mi:ss') ");
sql.append(" AND To_date('").append(dataAte).append("', 'dd/mm/yyyy HH24:mi:ss') ");
sql.append(" AND empresacorrida_id IN (").append(empresaId).append(") ");
sql.append(" WHERE empresacorrida_id IN (").append(empresaId).append(") ");
sql.append(" AND INDSTATUSBOLETO <> 'C' ");
sql.append(" )ca ");
sql.append(" INNER JOIN corrida c ON (c.corrida_id = ca.corrida_id AND c.feccorrida = ca.feccorrida) ");
@ -111,10 +109,7 @@ public class RelatorioLinhaOperacional extends Relatorio {
} else if (agruparPorAno) {
sql.append(" TO_CHAR(FECHORVTA, 'yyyy') fechorventa ");
}
sql.append(" FROM caja_diversos ");
sql.append(" WHERE FECHORVTA BETWEEN To_date('").append(dataDe).append("', 'dd/mm/yyyy HH24:mi:ss') ");
sql.append(" AND To_date('").append(dataAte).append("', 'dd/mm/yyyy HH24:mi:ss') ");
sql.append(" )ca ");
sql.append(" FROM caja_diversos)ca ");
sql.append(" INNER JOIN evento_extra ex ON ex.eventoextra_id = ca.eventoextra_id ");
sql.append(" INNER JOIN corrida c ON ( c.corrida_id = ex.corrida_id AND c.feccorrida = ex.feccorrida ) ");
sql.append(" INNER JOIN empresa e ON e.empresa_id = c.empresacorrida_id ");
@ -132,9 +127,12 @@ public class RelatorioLinhaOperacional extends Relatorio {
if (desconsiderarBilhetesDevolvidos) {
sql.append(" AND ca.MOTIVOCANCELACION_ID IS NULL ");
}
sql.append(" AND c.feccorrida BETWEEN To_date('").append(dataDe).append("', 'dd/mm/yyyy HH24:mi:ss') ");
sql.append(" AND To_date('").append(dataAte).append("', 'dd/mm/yyyy HH24:mi:ss') ");
sql.append("GROUP BY ca.fechorventa, c.corrida_id, c.feccorrida, r.NUMRUTA, r.PREFIXO, c.fechorsalida, r.descruta, o.descparada, d.descparada, e.empresa_id, e.nombempresa ");
sql.append("ORDER BY ca.fechorventa, e.nombempresa ASC ");
sql.append("ORDER BY c.feccorrida, e.nombempresa ASC ");
return sql.toString();
}

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

Binary file not shown.

4
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhaOperacional.jrxml
View File

@ -42,13 +42,13 @@
</groupFooter>
</group>
<group name="data_venda">
<groupExpression><![CDATA[$F{data_venda}]]></groupExpression>
<groupExpression><![CDATA[$F{DATA_CORRIDA}]]></groupExpression>
<groupHeader>
<band height="44">
<textField pattern="dd/MM/yyyy">
<reportElement uuid="40522537-b07f-4001-9b55-7c2ad1b78ee3" x="0" y="1" width="68" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{data_venda}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{DATA_CORRIDA}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="5f3a69a7-463d-48ea-99af-f5446c6afd9e" x="153" y="21" width="38" height="20"/>