fixes bug #7152
Artefatos Alterados: RelatorioCheckin.java RelatorioCheckin.jasper RelatorioCheckin.jrxml git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53271 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
c13d9cf65e
commit
9efdf0860f
|
@ -97,7 +97,7 @@ public class RelatorioCheckin extends Relatorio {
|
|||
sql.append(" then b.numfoliosistema else b.numoperacion end numoperacion, ");
|
||||
sql.append("b.feccorrida, bc.datavenda, bc.datacancelado, bc.dataremarcacao, u.nombusuario, u.cveusuario ");
|
||||
sql.append("from boleto b ");
|
||||
sql.append("inner join boleto_checkin bc on b.boletooriginal_id = bc.boletooriginal_id ");
|
||||
sql.append("inner join boleto_checkin bc on b.boleto_id = bc.boletooriginal_id ");
|
||||
sql.append("inner join parada o on b.origen_id = o.parada_id ");
|
||||
sql.append("inner join usuario u on b.usuario_id = u.usuario_id ");
|
||||
sql.append(" where b.activo = 1 ");
|
||||
|
@ -105,6 +105,7 @@ public class RelatorioCheckin extends Relatorio {
|
|||
sql.append(corridaId == null ? "" : " and b.corrida_id = ? ");
|
||||
sql.append(origenId == null ? "" : " and b.origen_id = ? ");
|
||||
sql.append((lsInt == null || lsInt.size() == 0) ? "" : " and u.USUARIO_ID in ( "+ createIn(lsInt.size()) + ") ");
|
||||
sql.append(" order by bc.datacancelado desc");
|
||||
|
||||
return sql.toString();
|
||||
}
|
||||
|
|
Binary file not shown.
|
@ -1,7 +1,7 @@
|
|||
<?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="RelatorioCheckin" pageWidth="675" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="635" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="48d32af4-ba9f-41c2-91a5-5d2fe57e149c">
|
||||
<property name="ireport.zoom" value="1.4641000000000008"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.x" value="82"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<parameter name="NOME_RELATORIO" class="java.lang.String"/>
|
||||
<parameter name="DATA_INICIAL" class="java.util.Date"/>
|
||||
|
@ -141,7 +141,7 @@
|
|||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$F{dataCancelado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="64e2b043-f9cb-4211-852c-def2fed7ae2c" x="376" y="0" width="115" height="20"/>
|
||||
|
|
Loading…
Reference in New Issue