- desativado o log4j no web.xml (pois usamos o jboss)

- correção no método de traslapa para numero bigdecimal
- adição do menu de redondeo

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@32574 d1611594-4594-4d17-8e1d-87c2c4800839
master
gleimar 2013-12-11 23:10:16 +00:00
parent 71594456a0
commit fe8ec8e627
1 changed files with 9 additions and 1 deletions

View File

@ -54,7 +54,15 @@ public class TraslaparUtil {
return false;
}
public static boolean intersectNum(BigDecimal numStart, BigDecimal numEnd, BigDecimal numStartCompare, BigDecimal numEndCompare) {
return intersectNum(numStart.longValue(), numEnd.longValue(), numStartCompare.longValue(), numEndCompare.longValue());
if (((numStart.compareTo(numStartCompare) >= 0) && (numEnd.compareTo(numEndCompare) <= 0))
|| ((numEnd.compareTo(numStartCompare) >= 0) && (numEnd.compareTo(numEndCompare) <= 0))
|| ((numStart.compareTo(numStartCompare) >= 0) && (numStart.compareTo(numEndCompare) <= 0))
|| ((numStart.compareTo(numStartCompare) <= 0) && (numEnd.compareTo(numEndCompare) >= 0))) {
return true;
}
return false;
}
public static boolean intersectNum(Integer numStart, Integer numEnd, Integer numStartCompare, Integer numEndCompare) {
return intersectNum(numStart.longValue(), numEnd.longValue(), numStartCompare.longValue(), numEndCompare.longValue());