From b632d7da799fc9d26a3deee64aa3bbe073045cc8 Mon Sep 17 00:00:00 2001 From: leonardo Date: Mon, 4 Feb 2019 16:17:50 +0000 Subject: [PATCH] =?UTF-8?q?13256:=20relat=C3=B3rio=20scaner=20-=20Relat?= =?UTF-8?q?=C3=B3rio=20de=20Demanda=20bug#13256=20dev:thiago=20qua:renato?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@89526 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioDemandasDetalhadoNovoLayout.java | 56 ++++++++++++------ ...elatorioDemandasDetalhadoNovoLayout.jasper | Bin 37292 -> 36404 bytes ...RelatorioDemandasDetalhadoNovoLayout.jrxml | 25 ++------ .../RelatorioDemandasController.java | 28 ++++++++- web/WEB-INF/i3-label_es_MX.label | 3 + web/WEB-INF/i3-label_pt_BR.label | 3 + .../relatorios/filtroRelatorioDemandas.zul | 14 ++++- 7 files changed, 88 insertions(+), 41 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java index 2556afbe6..d9d389783 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java @@ -12,12 +12,24 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.zkoss.util.resource.Labels; +import org.zkoss.zul.Messagebox; + +import com.rjconsultores.ventaboletos.dao.ConstanteDAO; +import com.rjconsultores.ventaboletos.entidad.Constante; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; +import bsh.StringUtil; + public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { - public RelatorioDemandasDetalhadoNovoLayout(Map parametros, Connection conexao) throws Exception { + public final String VENDA_EM_PE = "00"; + + public RelatorioDemandasDetalhadoNovoLayout(Map parametros, Connection conexao, final Boolean filtrarCrianca, final Boolean filtrarEmPe, final ConstanteDAO constanteDao) throws Exception { super(parametros, conexao); this.setCustomDataSource(new ArrayDataSource(this) { @Override @@ -60,12 +72,10 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" da.cantasientos as capacidade, "); sql.append(" count(bo.boleto_id) as ocupacao, "); sql.append(" ts.descservicio as tipo_servico, "); - sql.append(" ( select ctr1.PLATAFORMA from corrida_tramo ctr1 where ctr1.activo =1 and ctr1.corrida_id = co.corrida_id AND ctr1.numsecuencia = 1 AND ctr1.feccorrida = co.feccorrida AND ctr1.fechorsalida = co.FECHORSALIDA AND rownum <2 ) AS plataforma, "); sql.append(" e.nombempresa as empresa, "); sql.append(" r.INDSENTIDOIDA AS sentido "); sql.append("from boleto bo "); sql.append(" join corrida co on co.corrida_id = bo.corrida_id and co.feccorrida = bo.feccorrida "); - sql.append(" join corrida_tramo ct on ct.corrida_id = bo.corrida_id and bo.feccorrida = ct.feccorrida and ct.origen_id = bo.origen_id "); sql.append(" join ruta r on co.ruta_id = r.ruta_id "); sql.append(" left join empresa e on e.empresa_id = bo.empresacorrida_id "); sql.append(" join parada ori on ori.parada_id = co.origen_id "); @@ -74,15 +84,30 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" join rol_operativo ro on ro.roloperativo_id = co.roloperativo_id "); sql.append(" join diagrama_autobus da on ro.diagramaautobus_id = da.diagramaautobus_id "); sql.append(" join tipo_servicio ts on ts.tiposervicio_id = co.tiposervicio_id "); - sql.append("where ct.activo = 1 "); - sql.append(" and bo.motivocancelacion_id is null and bo.numasiento is not null and bo.indstatusoperacion = 'F' "); + sql.append(" where bo.motivocancelacion_id is null and bo.numasiento is not null and bo.indstatusoperacion = 'F' "); if (parametros.get("HORA_INICIAL") == null && parametros.get("HORA_FINAL") == null) { sql.append(" and co.fechorsalida >= :DATA_INICIAL and co.fechorsalida <= :DATA_FINAL "); } - sql.append(" and co.activo = 1 and bo.activo = 1 and ct.activo = 1 and r.activo = 1 and e.activo = 1 and ori.activo = 1 and "); + sql.append(" and co.activo = 1 and bo.activo = 1 and r.activo = 1 and e.activo = 1 and ori.activo = 1 and "); sql.append(" des.activo = 1 and cs.activo = 1 and ro.activo = 1 and da.activo = 1 and ts.activo = 1 "); + if (filtrarCrianca){ + Constante idGratuidadeCrianca = constanteDao.buscarPorNomeConstante("CRIANÇA GRATUIDADE"); + if (idGratuidadeCrianca != null && StringUtils.isNotBlank(idGratuidadeCrianca.getValorconstante())){ + sql.append(" and bo.categoria_id != "+ idGratuidadeCrianca.getValorconstante() +" "); + } else { + Messagebox.show( + Labels.getLabel("relatorioDemandasController.ConstanteGratuidadeError"), + Labels.getLabel("relatorioDemandasController.window.title"), + Messagebox.OK, Messagebox.ERROR); + } + } + + if (filtrarEmPe){ + sql.append(" and bo.numasiento != '"+VENDA_EM_PE+"' "); + } + sql.append((parametros.get("RUTA_ID") != null) ? " and r.ruta_id = :RUTA_ID " : ""); sql.append((parametros.get("EMPRESA_ID") != null) ? " and e.empresa_id = :EMPRESA_ID " : ""); sql.append((parametros.get("PARADA_ID") != null) ? " and bo.origen_id = :PARADA_ID " : ""); @@ -106,11 +131,11 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" ) "); } - sql.append("group by co.feccorrida, co.fechorsalida, r.descruta, r.numruta, co.corrida_id, ct.plataforma, "); + sql.append("group by co.feccorrida, co.fechorsalida, r.descruta, r.numruta, co.corrida_id, "); sql.append(" case when ((ori.indvisibleinternet is null or ori.indvisibleinternet = 1) "); sql.append(" and (des.indvisibleinternet is null or des.indvisibleinternet = 1)) then 'SIM' else 'NÃO' end, "); sql.append(" ori.descparada, des.descparada, cs.descclase, "); - sql.append(" da.cantasientos, ts.descservicio, ct.plataforma, e.nombempresa, r.INDSENTIDOIDA "); + sql.append(" da.cantasientos, ts.descservicio, e.nombempresa, r.INDSENTIDOIDA "); sql.append("order by data, horario, servico, linha, origem, destino "); sql.append(" ), nao_vendidos as ( "); @@ -136,14 +161,9 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" da.cantasientos AS capacidade, "); sql.append(" 0 AS ocupacao, "); sql.append(" ts.descservicio AS tipo_servico, "); - sql.append(" ( select ctr1.PLATAFORMA from corrida_tramo ctr1 where ctr1.activo =1 and ctr1.corrida_id = co.corrida_id AND ctr1.numsecuencia = 1 AND ctr1.feccorrida = co.feccorrida AND ctr1.fechorsalida = co.FECHORSALIDA AND rownum <2 ) AS plataforma, "); sql.append(" e.nombempresa AS empresa, "); sql.append(" r.INDSENTIDOIDA AS sentido "); sql.append(" FROM corrida co "); - sql.append(" JOIN corrida_tramo ct "); - sql.append(" ON ct.corrida_id = co.corrida_id "); - sql.append(" AND co.feccorrida = ct.feccorrida "); - sql.append(" AND ct.origen_id = co.origen_id "); sql.append(" JOIN ruta r "); sql.append(" ON co.ruta_id = r.ruta_id "); sql.append(" LEFT JOIN empresa e "); @@ -160,8 +180,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" ON ro.diagramaautobus_id = da.diagramaautobus_id "); sql.append(" JOIN tipo_servicio ts "); sql.append(" ON ts.tiposervicio_id = co.tiposervicio_id "); - sql.append(" WHERE ct.activo = 1 "); - sql.append(" and co.activo = 1 "); + sql.append(" WHERE co.activo = 1 "); if (parametros.get("HORA_INICIAL") == null && parametros.get("HORA_FINAL") == null) { sql.append(" and co.FECHORSALIDA >= :DATA_INICIAL and co.FECHORSALIDA <= :DATA_FINAL "); } @@ -174,7 +193,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" and (co.CORRIDA_ID, co.feccorrida) not in (select servico, data_corrida from vendidos ) "); - sql.append(" and co.activo = 1 and ct.activo = 1 and r.activo = 1 and e.activo = 1 and ori.activo = 1 and des.activo = 1 and "); + sql.append(" and co.activo = 1 and r.activo = 1 and e.activo = 1 and ori.activo = 1 and des.activo = 1 and "); sql.append(" cs.activo = 1 and ro.activo = 1 and da.activo = 1 and ts.activo = 1 "); if (parametros.get("HORA_INICIAL") != null && parametros.get("HORA_FINAL") != null) { @@ -195,10 +214,10 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { } sql.append(" )select "); - sql.append(" DATA_CORRIDA, DATA, LINHA, CODLINHA, SERVICO, INTERNET, HORARIO, ORIGEM, DESTINO, CLASSE, CAPACIDADE, SUM(OCUPACAO) OCUPACAO, TIPO_SERVICO, PLATAFORMA, EMPRESA, SENTIDO "); + sql.append(" DATA_CORRIDA, DATA, LINHA, CODLINHA, SERVICO, INTERNET, HORARIO, ORIGEM, DESTINO, CLASSE, CAPACIDADE, SUM(OCUPACAO) OCUPACAO, TIPO_SERVICO, EMPRESA, SENTIDO "); sql.append(" from ( "); sql.append(" select * from vendidos v union select * from nao_vendidos ) "); - sql.append(" GROUP BY DATA_CORRIDA, DATA, LINHA, CODLINHA, SERVICO, INTERNET, HORARIO, ORIGEM, DESTINO, CLASSE, CAPACIDADE, TIPO_SERVICO, PLATAFORMA, EMPRESA, SENTIDO "); + sql.append(" GROUP BY DATA_CORRIDA, DATA, LINHA, CODLINHA, SERVICO, INTERNET, HORARIO, ORIGEM, DESTINO, CLASSE, CAPACIDADE, TIPO_SERVICO, EMPRESA, SENTIDO "); sql.append(" order by data, horario, servico, linha, origem, destino "); @@ -233,7 +252,6 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { dataResult.put("CLASSE", rset.getString("CLASSE")); dataResult.put("CAPACIDADE", rset.getInt("CAPACIDADE")); dataResult.put("TIPO_SERVICO", rset.getString("TIPO_SERVICO")); - dataResult.put("PLATAFORMA", rset.getString("PLATAFORMA")); dataResult.put("OCUPACAO", rset.getInt("OCUPACAO")); dataResult.put("EMPRESA", rset.getString("EMPRESA")); dataResult.put("CODLINHA", rset.getString("CODLINHA")); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jasper index 3fba3d55c2b5a61fb10a437cd05d7efbf98d6c1a..65f7c9da47bb242a25b17ea2585b32195859f016 100644 GIT binary patch delta 8720 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 MmezUGXCL$ZH;jdJG5`Po delta 9671 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml index 3c143535d..d9c70b5f4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml @@ -1,7 +1,7 @@ - +