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

fixes bug #8301 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64584 d1611594-4594-4d17-8e1d-87c2c4800839
master
edgar 2017-01-05 18:29:56 +00:00
parent 3eb85e15fc
commit 8eeee99fd8
3 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.classpath
View File

@ -2,7 +2,6 @@
<classpath> <classpath>
<classpathentry kind="src" path="src/java"/> <classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/antlr-2.7.6.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/antlr-2.7.6.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/aopalliance-1.0.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/aopalliance-1.0.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/asm-attrs.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/asm-attrs.jar"/>
@ -53,7 +52,7 @@
<classpathentry kind="lib" path="/LibreriasAdmVenta/zhtml.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/zhtml.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zk.jar" sourcepath="C:/Users/rjgw/.m2/repository/org/zkoss/zk/zk/5.0.9/zk-5.0.9-sources.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/zk.jar" sourcepath="C:/Users/rjgw/.m2/repository/org/zkoss/zk/zk/5.0.9/zk-5.0.9-sources.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zkplus.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/zkplus.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zul.jar" sourcepath="C:/Users/Zauli/.m2/repository/org/zkoss/zk/zul/5.0.9/zul-5.0.9-sources.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/zul.jar" sourcepath="C:/Users/vpaiva/.m2/repository/org/zkoss/zk/zul/5.0.9/zul-5.0.9-sources.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zweb.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/zweb.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.aop-3.0.6.RELEASE.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.aop-3.0.6.RELEASE.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.asm-3.0.6.RELEASE.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/org.springframework.asm-3.0.6.RELEASE.jar"/>
@ -94,20 +93,15 @@
<classpathentry kind="lib" path="/LibreriasAdmVenta/jasperreports-5.1.0.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/jasperreports-5.1.0.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/jasperreports-fonts-5.1.0.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/jasperreports-fonts-5.1.0.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/jasperreports-javaflow-5.1.0.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/jasperreports-javaflow-5.1.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 6.x Runtime"> <classpathentry combineaccessrules="false" kind="src" path="/WSTotvs"/>
<attributes> <classpathentry kind="lib" path="/LibreriasAdmVenta/flyway-core-4.0.1.jar"/>
<attribute name="owner.project.facets" value="jst.web"/> <classpathentry combineaccessrules="false" kind="src" path="/Flyway"/>
</attributes> <classpathentry combineaccessrules="false" kind="src" path="/WSAG"/>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/WSTotvs"/> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/ADM"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/flyway-core-4.0.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/Flyway"/>
<classpathentry combineaccessrules="false" kind="src" path="/WSAG"/>
<classpathentry kind="lib" path="/LibreriasWSAG/axis-1.4.jar"/>
<classpathentry kind="output" path="build/classes"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>

27
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java
View File

@ -1,24 +1,26 @@
package com.rjconsultores.ventaboletos.relatorios.impl; package com.rjconsultores.ventaboletos.relatorios.impl;
import java.net.URL; import java.math.BigDecimal;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.service.SegVKMService;
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
public class RelatorioTabelaPreco extends Relatorio { public class RelatorioTabelaPreco extends Relatorio {
private Boolean isLayoutArtesp; private Boolean isLayoutArtesp;
private SegVKMService segVKMService;
public RelatorioTabelaPreco(final Map<String, Object> parametros, Connection conexao) throws Exception { public RelatorioTabelaPreco(final Map<String, Object> parametros, Connection conexao, SegVKMService segVKMService) throws Exception {
super(parametros, conexao); super(parametros, conexao);
this.segVKMService = segVKMService;
this.isLayoutArtesp = (Boolean) parametros.get("isLayoutArtesp"); this.isLayoutArtesp = (Boolean) parametros.get("isLayoutArtesp");
this.setCustomDataSource(new ArrayDataSource(this) { this.setCustomDataSource(new ArrayDataSource(this) {
public void initDados() throws Exception { public void initDados() throws Exception {
@ -26,15 +28,22 @@ public class RelatorioTabelaPreco extends Relatorio {
NamedParameterStatement stmt = new NamedParameterStatement(conexao, getSql()); NamedParameterStatement stmt = new NamedParameterStatement(conexao, getSql());
ResultSet rset = stmt.executeQuery(); ResultSet rset = stmt.executeQuery();
String series = RelatorioTabelaPreco.this.segVKMService.seriePorEmpresa((Integer) parametros.get("EMPRESA_ID"));
while (rset.next()) { while (rset.next()) {
Map<String, Object> dataResult = new HashMap<String, Object>(); Map<String, Object> dataResult = new HashMap<String, Object>();
BigDecimal valorSegOpcional = BigDecimal.ZERO;
if (isLayoutArtesp) {
valorSegOpcional = RelatorioTabelaPreco.this.segVKMService.buscarSeguroPorKm(rset.getLong("kmReal"),
series, (Integer) parametros.get("ORGAO_CONCEDENTE_ID"));
}
dataResult.put("origem", rset.getString("origem")); dataResult.put("origem", rset.getString("origem"));
dataResult.put("destino", rset.getString("destino")); dataResult.put("destino", rset.getString("destino"));
dataResult.put("tarifa", rset.getBigDecimal("tarifa")); dataResult.put("tarifa", rset.getBigDecimal("tarifa"));
dataResult.put("pedagio", rset.getBigDecimal("pedagio")); dataResult.put("pedagio", rset.getBigDecimal("pedagio"));
dataResult.put("taxaEmbarque", rset.getBigDecimal("taxaEmbarque")); dataResult.put("taxaEmbarque", rset.getBigDecimal("taxaEmbarque"));
dataResult.put("seguroOpcional", rset.getBigDecimal("valorSegOpcional")); dataResult.put("seguroOpcional", valorSegOpcional);
dataResult.put("outros", rset.getBigDecimal("outros")); dataResult.put("outros", rset.getBigDecimal("outros"));
dataResult.put("tipoClasse", rset.getString("tipoClasse")); dataResult.put("tipoClasse", rset.getString("tipoClasse"));
dataResult.put("empresa", rset.getString("empresa")); dataResult.put("empresa", rset.getString("empresa"));
@ -63,7 +72,7 @@ public class RelatorioTabelaPreco extends Relatorio {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
if (isLayoutArtesp) { if (isLayoutArtesp) {
sql.append("SELECT DISTINCT origem,destino,tarifa,pedagio,taxaEmbarque,valorSegOpcional,outros,tipoClasse,empresa FROM ("); sql.append("SELECT DISTINCT origem,destino,tarifa,pedagio,taxaEmbarque,outros,tipoClasse,empresa,kmReal FROM (");
} }
sql.append(" SELECT pOrigem.DESCPARADA as origem, "); sql.append(" SELECT pOrigem.DESCPARADA as origem, ");
sql.append(" pDestino.DESCPARADA as destino, "); sql.append(" pDestino.DESCPARADA as destino, ");
@ -71,7 +80,6 @@ public class RelatorioTabelaPreco extends Relatorio {
sql.append(" COALESCE(t.IMPORTEPEDAGIO, 0) as pedagio, "); sql.append(" COALESCE(t.IMPORTEPEDAGIO, 0) as pedagio, ");
sql.append(" COALESCE(t.IMPORTETAXAEMBARQUE, 0) as taxaEmbarque, "); sql.append(" COALESCE(t.IMPORTETAXAEMBARQUE, 0) as taxaEmbarque, ");
sql.append(" COALESCE(t.IMPORTESEGURO, 0) as seguro, "); sql.append(" COALESCE(t.IMPORTESEGURO, 0) as seguro, ");
sql.append(" COALESCE(segop.VALOR, 0) as valorSegOpcional, ");
sql.append(" COALESCE(t.IMPORTEOUTROS, 0) as outros, "); sql.append(" COALESCE(t.IMPORTEOUTROS, 0) as outros, ");
sql.append(" cs.DESCCLASE as tipoClasse, "); sql.append(" cs.DESCCLASE as tipoClasse, ");
sql.append(" r.DESCRUTA as linha, "); sql.append(" r.DESCRUTA as linha, ");
@ -80,7 +88,8 @@ public class RelatorioTabelaPreco extends Relatorio {
sql.append(" vt.FECFINVIGENCIA as dataVigenciaFinal, "); sql.append(" vt.FECFINVIGENCIA as dataVigenciaFinal, ");
sql.append(" vt.VIGENCIATARIFA_ID as idVigencia, "); sql.append(" vt.VIGENCIATARIFA_ID as idVigencia, ");
sql.append(" vt.FECINICIOVIGENCIA as dataVigenciaInicial, "); sql.append(" vt.FECINICIOVIGENCIA as dataVigenciaInicial, ");
sql.append(" r.RUTA_ID as idLinha "); sql.append(" r.RUTA_ID as idLinha, ");
sql.append(" tr.CANTKMREAL as kmReal ");
sql.append("FROM TARIFA t "); sql.append("FROM TARIFA t ");
sql.append("INNER JOIN PARADA pOrigem ON t.ORIGEN_ID = pOrigem.PARADA_ID "); sql.append("INNER JOIN PARADA pOrigem ON t.ORIGEN_ID = pOrigem.PARADA_ID ");
sql.append("INNER JOIN PARADA pDestino ON t.DESTINO_ID = pDestino.PARADA_ID "); sql.append("INNER JOIN PARADA pDestino ON t.DESTINO_ID = pDestino.PARADA_ID ");
@ -92,8 +101,6 @@ public class RelatorioTabelaPreco extends Relatorio {
sql.append("INNER JOIN RUTA_COMBINACION rc ON rc.RUTA_ID = r.RUTA_ID "); sql.append("INNER JOIN RUTA_COMBINACION rc ON rc.RUTA_ID = r.RUTA_ID ");
sql.append("INNER JOIN TRAMO tr ON tr.TRAMO_ID = rc.TRAMO_ID "); sql.append("INNER JOIN TRAMO tr ON tr.TRAMO_ID = rc.TRAMO_ID ");
sql.append("INNER JOIN ORGAO_CONCEDENTE o ON o.ORGAOCONCEDENTE_ID = r.ORGAOCONCEDENTE_ID "); sql.append("INNER JOIN ORGAO_CONCEDENTE o ON o.ORGAOCONCEDENTE_ID = r.ORGAOCONCEDENTE_ID ");
sql.append("INNER JOIN SEGURADORA_EMPRESA se on se.EMPRESA_ID=e.EMPRESA_ID ");
sql.append("LEFT JOIN SEGVKM segOp on segOp.KM=tr.CANTKMREAL and segOp.SERIE=se.SERIESEGURADORA ");
sql.append("WHERE rc.INDVENTA = 1 "); sql.append("WHERE rc.INDVENTA = 1 ");
sql.append("AND rc.ACTIVO = 1 "); sql.append("AND rc.ACTIVO = 1 ");
sql.append("AND tr.ACTIVO = 1 "); sql.append("AND tr.ACTIVO = 1 ");

13
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java
View File

@ -32,6 +32,7 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService;
import com.rjconsultores.ventaboletos.service.ParadaService; import com.rjconsultores.ventaboletos.service.ParadaService;
import com.rjconsultores.ventaboletos.service.SegVKMService;
import com.rjconsultores.ventaboletos.service.TramoService; import com.rjconsultores.ventaboletos.service.TramoService;
import com.rjconsultores.ventaboletos.service.VigenciaTarifaService; import com.rjconsultores.ventaboletos.service.VigenciaTarifaService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@ -74,6 +75,8 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer {
private ParadaService paradaService; private ParadaService paradaService;
@Autowired @Autowired
private DataSource dataSourceRead; private DataSource dataSourceRead;
@Autowired
private SegVKMService segVKMService;
private List<Parada> destinoList; private List<Parada> destinoList;
private List<VigenciaTarifa> lsVigencia; private List<VigenciaTarifa> lsVigencia;
@ -152,7 +155,7 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer {
} }
parametros.put("LINHAS", rutas); parametros.put("LINHAS", rutas);
Relatorio relatorio = new RelatorioTabelaPreco(parametros, dataSourceRead.getConnection()); Relatorio relatorio = new RelatorioTabelaPreco(parametros, dataSourceRead.getConnection(), segVKMService);
Map<String, Object> args = new HashMap<String, Object>(); Map<String, Object> args = new HashMap<String, Object>();
args.put("relatorio", relatorio); args.put("relatorio", relatorio);
@ -186,6 +189,14 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer {
linhaSelList.addItemNovo(ruta); linhaSelList.addItemNovo(ruta);
} }
public void onClick$chkLayoutArtesp() {
if (chkLayoutArtesp.isChecked()) {
cmbOrgaoConcedente.setConstraint("no empty");
} else {
cmbOrgaoConcedente.setConstraint((String) null);
}
}
public void onChange$cmbOrigem(Event ev) { public void onChange$cmbOrigem(Event ev) {
Parada origem = cmbOrigem.getSelectedObject(); Parada origem = cmbOrigem.getSelectedObject();
destinoList = paradaService.obterPossiveisDestinos(origem); destinoList = paradaService.obterPossiveisDestinos(origem);