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

fixes bug#23717 

qua:
dev:Valdir

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@109831 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdevir 2021-12-01 13:33:06 +00:00
parent e8caa42126
commit 7f10379274
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java
View File

@ -106,19 +106,24 @@ public class RelatorioCheckin extends Relatorio {
sql.append("inner join boleto_checkin bc on b.boleto_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 parada o on b.origen_id = o.parada_id ");
sql.append("inner join usuario u on bc.usuario_id = u.usuario_id "); sql.append("inner join usuario u on bc.usuario_id = u.usuario_id ");
//Se a corrida_id e feccorrida existe na tabela checkin_cerrado = checkin encerrado
if(indCheckinEncerrado) {
sql.append("inner join checkin_cerrado cc on (b.corrida_id = cc.corrida_id and b.feccorrida=cc.feccorrida )");
}else {
//Se a corrida_id e feccorrida não existe na tabela checkin_cerrado = checkin aberto
if(indCheckinAberto) {
sql.append(" left join checkin_cerrado cc on (b.corrida_id = cc.corrida_id and b.feccorrida=cc.feccorrida ) ");
}
}
sql.append(" where b.activo = 1 "); sql.append(" where b.activo = 1 ");
sql.append("and bc.FECMODIF between ? and ? "); sql.append("and bc.FECMODIF between ? and ? ");
sql.append(corridaId == null ? "" : " and b.corrida_id = ? "); sql.append(corridaId == null ? "" : " and b.corrida_id = ? ");
sql.append(origenId == null ? "" : " and b.origen_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((lsInt == null || lsInt.size() == 0) ? "" : " and u.USUARIO_ID in ( "+ createIn(lsInt.size()) + ") ");
if(indCheckinEncerrado) { if(indCheckinAberto) {
sql.append("and bc.INDCHECKINCERRADO = 1"); sql.append(" and cc.corrida_id is null ");
}else {
if(indCheckinAberto) {
sql.append("and bc.INDCHECKINCERRADO = 0");
}
} }
sql.append(" order by bc.datacancelado desc"); sql.append(" order by bc.datacancelado desc");
return sql.toString(); return sql.toString();