bug#10381

dev:Daniel
qua:Renato

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79725 d1611594-4594-4d17-8e1d-87c2c4800839
master
alexandre.lima 2018-03-09 17:41:12 +00:00
parent d91757545a
commit 91253d173c
3 changed files with 23 additions and 10 deletions

View File

@ -57,12 +57,18 @@ public class RelatorioLinhaOperacional extends Relatorio {
StringBuilder sql = new StringBuilder();
sql.append(" SELECT ");
sql.append(" ca.fechorventa data_venda, ");
sql.append(" c.corrida_id corrida_id, ");
if (agruparPorDia) {
sql.append(" to_char(c.feccorrida,'dd/mm/yyyy') data_corrida_formatada, ");
} else if (agruparPorMes) {
sql.append(" to_char(c.feccorrida,'mm/yyyy') data_corrida_formatada, ");
} else if (agruparPorAno) {
sql.append(" to_char(c.feccorrida,'yyyy') data_corrida_formatada, ");
}
sql.append(" c.feccorrida data_corrida, ");
sql.append(" r.NUMRUTA codigo, ");
sql.append(" r.PREFIXO prefixo, ");
sql.append(" c.fechorsalida hora_saida, ");
sql.append(" to_char(c.fechorsalida, 'hh:MM') hora_saida, ");
sql.append(" r.descruta linha, ");
sql.append(" o.descparada origem, ");
sql.append(" d.descparada destino, ");
@ -131,8 +137,15 @@ public class RelatorioLinhaOperacional extends Relatorio {
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 c.feccorrida, e.nombempresa ASC ");
sql.append("GROUP BY c.corrida_id, c.feccorrida, r.NUMRUTA, r.PREFIXO, to_char(c.fechorsalida, 'hh:MM'), r.descruta, o.descparada, d.descparada, e.empresa_id, e.nombempresa, ");
if (agruparPorDia) {
sql.append(" to_char(c.feccorrida,'dd/mm/yyyy') ");
} else if (agruparPorMes) {
sql.append(" to_char(c.feccorrida,'mm/yyyy') ");
} else if (agruparPorAno) {
sql.append(" to_char(c.feccorrida,'yyyy') ");
}
sql.append("ORDER BY c.feccorrida, r.descruta");
return sql.toString();
}

View File

@ -15,7 +15,7 @@
<![CDATA[$P!{SQL}]]>
</queryString>
<field name="DATA_CORRIDA" class="java.sql.Timestamp"/>
<field name="HORA_SAIDA" class="java.sql.Timestamp"/>
<field name="HORA_SAIDA" class="java.lang.String"/>
<field name="LINHA" class="java.lang.String"/>
<field name="ORIGEM" class="java.lang.String"/>
<field name="DESTINO" class="java.lang.String"/>
@ -24,8 +24,8 @@
<field name="QTDE_BOLETOS" class="java.math.BigDecimal"/>
<field name="codigo" class="java.lang.String"/>
<field name="prefixo" class="java.lang.String"/>
<field name="data_venda" class="java.lang.String"/>
<field name="corrida_id" class="java.lang.String"/>
<field name="data_corrida_formatada" class="java.lang.String"/>
<variable name="QTDE_BOLETOS_2" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
<variableExpression><![CDATA[$F{QTDE_BOLETOS}]]></variableExpression>
</variable>
@ -42,13 +42,13 @@
</groupFooter>
</group>
<group name="data_venda">
<groupExpression><![CDATA[$F{DATA_CORRIDA}]]></groupExpression>
<groupExpression><![CDATA[$F{data_corrida_formatada}]]></groupExpression>
<groupHeader>
<band height="44">
<textField pattern="dd/MM/yyyy">
<textField pattern="">
<reportElement uuid="40522537-b07f-4001-9b55-7c2ad1b78ee3" x="0" y="1" width="68" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{DATA_CORRIDA}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{data_corrida_formatada}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="5f3a69a7-463d-48ea-99af-f5446c6afd9e" x="153" y="21" width="38" height="20"/>
@ -228,7 +228,7 @@
</columnHeader>
<detail>
<band height="14" splitType="Stretch">
<textField pattern="HH.mm" isBlankWhenNull="true">
<textField pattern="" isBlankWhenNull="true">
<reportElement uuid="3c1495b2-eb67-4d1a-8483-47526b4e14be" x="91" y="0" width="27" height="12" isPrintWhenDetailOverflows="true"/>
<textElement>
<font size="8"/>