diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java index 702b8db9a..9139a06a7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java @@ -55,7 +55,6 @@ public class VigenciaTarifaHibernateDAO extends if (fim != null) { c.add(Restrictions.eq("fecfinvigencia", fim)); } - return c.list(); } @@ -65,7 +64,12 @@ public class VigenciaTarifaHibernateDAO extends c.add(Restrictions.eq("activo", Boolean.TRUE)); c.add(Restrictions.ge("fecfinvigencia", vt.getFeciniciovigencia())); c.add(Restrictions.le("feciniciovigencia", vt.getFecfinvigencia())); + + if (vt.getVigenciatarifaId() != null) { + c.add(Restrictions.ne("vigenciatarifaId", vt.getVigenciatarifaId())); + } + c.addOrder(Order.asc("feciniciovigencia")); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java b/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java index 00e956c91..abb2045f7 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java @@ -241,7 +241,7 @@ public final class DateUtil { } public static String getStringDate(java.util.Date d, String formato) { - if(d != null) { + if (d != null) { DateFormat df = new SimpleDateFormat(formato); return df.format(d); } @@ -577,9 +577,17 @@ public final class DateUtil { c.add(Calendar.DAY_OF_MONTH, dias); return c.getTime(); } - + + public static Date somarMinutos(Date data, int quantidadeMinutos) { + Calendar c = Calendar.getInstance(); + c.setTime(data); + c.add(Calendar.MINUTE, quantidadeMinutos); + return c.getTime(); + } + /** * Formato competencia: MM/YYYY + * * @param competencia * @return */ @@ -590,37 +598,38 @@ public final class DateUtil { Calendar cal = Calendar.getInstance(); cal.set(Calendar.MONTH, Integer.valueOf(vetCompetencia[0]) - 1); cal.set(Calendar.YEAR, Integer.valueOf(vetCompetencia[1])); - + for (int i = 1; i <= cal.getActualMaximum(Calendar.DAY_OF_MONTH); i++) { diasCompetencia.add(i); } - + return diasCompetencia; } - + public static boolean isCompetenciaValida(String competencia) { - if(StringUtils.isNotBlank(competencia)) { + if (StringUtils.isNotBlank(competencia)) { Integer mes = Integer.valueOf(competencia.split("/")[0]); Integer minMes = Calendar.JANUARY + 1; Integer maxMes = Calendar.DECEMBER + 1; return mes >= minMes && mes <= maxMes; } - + return false; } public static Date getDataFinalCompetencia(String competencia) throws ParseException { - if(isCompetenciaValida(competencia)) { - Date dataInicio = getDateFromString("01/"+competencia, "dd/MM/yyyy"); + if (isCompetenciaValida(competencia)) { + Date dataInicio = getDateFromString("01/" + competencia, "dd/MM/yyyy"); Calendar cal = Calendar.getInstance(LocaleUtil.getLocale()); cal.setTime(dataInicio); - return getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH)+"/"+competencia, "dd/MM/yyyy"); + return getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy"); } return null; } + public static Date getDataInicialCompetencia(String competencia) throws ParseException { - if(isCompetenciaValida(competencia)) { - return getDateFromString("01/"+competencia, "dd/MM/yyyy"); + if (isCompetenciaValida(competencia)) { + return getDateFromString("01/" + competencia, "dd/MM/yyyy"); } return null; }