From 3476dd45fe154deb1012130b08f07c2ece610aa8 Mon Sep 17 00:00:00 2001 From: gleimar Date: Fri, 18 Sep 2015 18:06:06 +0000 Subject: [PATCH] fixes bug#6630 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@48000 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../service/impl/CorridaServiceImpl.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java index dcbca469d..00b316b46 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java @@ -82,6 +82,7 @@ public class CorridaServiceImpl implements CorridaService { private static Logger log = Logger.getLogger(CorridaServiceImpl.class); private static int CANT_MAX_CORRIDA_GERA_MANUAL = 40; + private static SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); @Autowired private CorridaDAO corridaDAO; @@ -320,7 +321,6 @@ public class CorridaServiceImpl implements CorridaService { GregorianCalendar gHoraSaidaProximo = new GregorianCalendar(); gHoraSaidaProximo.setTime(horaChegadaAnterior); - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); log.debug("Tempo Recorrido : " + sdf.format(gHoraSaidaProximo.getTime())); if (tiempoEstanciaAnterior != null) { @@ -642,6 +642,20 @@ public class CorridaServiceImpl implements CorridaService { corridaTramo.setFechorSalidaOriginalH(corridaTramo.getFechorSalidaOriginal()); } + //como husoHorVeranoLlegadaAnterior vai virar a hora de saída na proxima execução do loop, já corrijo o tiempoestancia + if (tiempoInstanciaAnterior != null){ + GregorianCalendar tmp = new GregorianCalendar(); + tmp.setTime(husoHorVeranoLlegadaAnterior); + + tmp.add(Calendar.MINUTE, tiempoInstanciaAnterior.getMinutes()); + tmp.add(Calendar.HOUR_OF_DAY, tiempoInstanciaAnterior.getHours()); + + log.debug("Tempo Recorrido H + Estancia: " + sdf.format(tmp.getTime())); + + husoHorVeranoLlegadaAnterior = tmp.getTime(); + + } + if (numSec == 1) { corrida.setFechorSalidaOriginalH(corridaTramo.getFechorsalidaH()); }