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

fixes bug #7587 - reajuste automatico de vigencia - merge 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@58379 d1611594-4594-4d17-8e1d-87c2c4800839
master
edgar 2016-07-28 12:20:17 +00:00
parent 4d617f9695
commit 24960f82cc
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java
View File

@ -55,7 +55,6 @@ public class VigenciaTarifaHibernateDAO extends
if (fim != null) { if (fim != null) {
c.add(Restrictions.eq("fecfinvigencia", fim)); c.add(Restrictions.eq("fecfinvigencia", fim));
} }
return c.list(); return c.list();
} }
@ -66,6 +65,11 @@ public class VigenciaTarifaHibernateDAO extends
c.add(Restrictions.ge("fecfinvigencia", vt.getFeciniciovigencia())); c.add(Restrictions.ge("fecfinvigencia", vt.getFeciniciovigencia()));
c.add(Restrictions.le("feciniciovigencia", vt.getFecfinvigencia())); 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(); return c.list();
} }

9
src/com/rjconsultores/ventaboletos/utilerias/DateUtil.java
View File

@ -578,8 +578,16 @@ public final class DateUtil {
return c.getTime(); 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 * Formato competencia: MM/YYYY
*
* @param competencia * @param competencia
* @return * @return
*/ */
@ -618,6 +626,7 @@ public final class DateUtil {
} }
return null; return null;
} }
public static Date getDataInicialCompetencia(String competencia) throws ParseException { public static Date getDataInicialCompetencia(String competencia) throws ParseException {
if (isCompetenciaValida(competencia)) { if (isCompetenciaValida(competencia)) {
return getDateFromString("01/" + competencia, "dd/MM/yyyy"); return getDateFromString("01/" + competencia, "dd/MM/yyyy");