From c4adcc2da6c44a668c358d36dc20d81ce329224f Mon Sep 17 00:00:00 2001 From: thiago Date: Tue, 13 Oct 2015 19:17:06 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#6735=20-=20Incluidos=20org=C3=A3?= =?UTF-8?q?os=20concedentes=20com=20mesmos=20c=C3=A1lculo=20da=20antt.=20A?= =?UTF-8?q?lterado=20c=C3=B3digo=20para=20verificarem=20duas=20listas(=20O?= =?UTF-8?q?RGAOS=5FCONCEDENTES=5FCALCULO=5FANTT=20e=20ORGAOS=5FCONCEDENTES?= =?UTF-8?q?=5FCALCULO=5FARTESP)=20e=20caso=20sejam=20inseridos=20novos=20?= =?UTF-8?q?=C3=B3rg=C3=A3os=20que=20sejam=20adicionados=20nessas=20listas?= =?UTF-8?q?=20e=20passar=C3=A3o=20a=20calcular=20conforme=20um=20desses=20?= =?UTF-8?q?=C3=B3rg=C3=A3os=20principais.?= 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@48935 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../tarifas/CalcularPeajeController.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java index ea1e72afd..4a5621eeb 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java @@ -1,11 +1,6 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; -import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -17,15 +12,13 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Combobox; import org.zkoss.zul.Messagebox; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.Tramo; import com.rjconsultores.ventaboletos.service.CalcularPeajeService; import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; import com.rjconsultores.ventaboletos.service.RutaService; import com.rjconsultores.ventaboletos.service.TramoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Controller("calcularPeajeController") @@ -68,8 +61,13 @@ public class CalcularPeajeController extends MyGenericForwardComposer { super.doAfterCompose(comp); lsOrgaoConcedente = new ArrayList(); - lsOrgaoConcedente.add(orgaoConcedenteService.obtenerID(3)); - lsOrgaoConcedente.add(orgaoConcedenteService.obtenerID(21)); + + for (Integer orgaoConcedenteId : Constantes.ORGAOS_CONCEDENTES_CALCULO_ANTT) { + lsOrgaoConcedente.add(orgaoConcedenteService.obtenerID(orgaoConcedenteId)); + } + for (Integer orgaoConcedenteId : Constantes.ORGAOS_CONCEDENTES_CALCULO_ARTESP) { + lsOrgaoConcedente.add(orgaoConcedenteService.obtenerID(orgaoConcedenteId)); + } }