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

fixes bug#15922 

dev:Wilian
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@97699 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago 2019-09-18 19:20:11 +00:00
parent c20ae6f978
commit 92ba8072a3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,7 @@ public class RelatorioBPe extends Relatorio {
sql.append(" LEFT JOIN PARADA ori on bol.ORIGEN_ID = ori.PARADA_ID "); sql.append(" LEFT JOIN PARADA ori on bol.ORIGEN_ID = ori.PARADA_ID ");
sql.append(" LEFT JOIN PARADA dest on bol.DESTINO_ID = dest.PARADA_ID "); sql.append(" LEFT JOIN PARADA dest on bol.DESTINO_ID = dest.PARADA_ID ");
sql.append(" WHERE bol.ACTIVO = 1 and e.ACTIVO = 1 "); sql.append(" WHERE e.ACTIVO = 1 ");
if (empresaId != null) { if (empresaId != null) {
sql.append(" AND ep.EMPRESA_ID = " + empresaId + " "); sql.append(" AND ep.EMPRESA_ID = " + empresaId + " ");
@ -107,17 +107,17 @@ public class RelatorioBPe extends Relatorio {
} }
if (status != null && status.equals("A")) { if (status != null && status.equals("A")) {
sql.append(" AND bpe.CODSTAT = '100' AND bpe.TIPOSUBSTITUICAO IS NULL "); sql.append(" AND bpe.CODSTAT = '100' AND bpe.TIPOSUBSTITUICAO IS NULL AND bol.ACTIVO = 1 ");
} else if (status != null && status.equals("C")) { } else if (status != null && status.equals("C")) {
sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110111' "); sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110111' AND bol.ACTIVO = 1 ");
} else if (status != null && status.equals("S")) { } else if (status != null && status.equals("S")) {
sql.append(" AND bpe.CODSTAT IN ('100', '102') AND bpe.TIPOSUBSTITUICAO IS NOT NULL "); sql.append(" AND bpe.CODSTAT IN ('100', '102') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 ");
} else if (status != null && status.equals("NE")) { } else if (status != null && status.equals("NE")) {
sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' "); sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' AND bol.ACTIVO = 1 ");
} else if (status != null && status.equals("R")) { } else if (status != null && status.equals("R")) {
sql.append(" AND bpe.CODSTAT NOT IN ('100','135') "); sql.append(" AND bpe.CODSTAT NOT IN ('100','135','102','150') ");
}else if (status != null && status.equals("AA")) { }else if (status != null && status.equals("AA")) {
sql.append(" AND bpe.CODSTAT = '150' AND bpe.TIPOSUBSTITUICAO IS NULL "); sql.append(" AND bpe.CODSTAT = '150' AND bpe.TIPOSUBSTITUICAO IS NULL AND bol.ACTIVO = 1 ");
} }
sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') "); sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') ");

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java
View File

@ -95,7 +95,7 @@ public class RelatorioBPeController extends MyGenericForwardComposer {
String estadosIds = ""; String estadosIds = "";
String UFs = ""; String UFs = "";
List<Object> lsEstadosSelecionados = estadoList.getSelectedsItens(); List<Object> lsEstadosSelecionados = estadoList.getSelectedsItens();
if (lsEstadosSelecionados.size() > 0) { if (!lsEstadosSelecionados.isEmpty()) {
for (int i = 0; i < lsEstadosSelecionados.size(); i++) { for (int i = 0; i < lsEstadosSelecionados.size(); i++) {
Estado estado = (Estado) lsEstadosSelecionados.get(i); Estado estado = (Estado) lsEstadosSelecionados.get(i);
UFs = UFs + estado.getCveestado() + ","; UFs = UFs + estado.getCveestado() + ",";