|
@@ -18,6 +18,7 @@ import org.springblade.manager.entity.WbsTreeContract;
|
|
|
import org.springblade.manager.utils.RandomNumberHolder;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDate;
|
|
@@ -1749,13 +1750,13 @@ public class CustomFunction {
|
|
|
for (Object obj : l1) {
|
|
|
String[] arr = obj.toString().split("[×xX*/]");
|
|
|
if (Arrays.stream(Arrays.stream(arr).toArray()).allMatch(StringUtils::isNumber)) {
|
|
|
- if (Arrays.stream(Arrays.stream(arr).toArray()).map(StringUtils::handleNull).map(Double::parseDouble).noneMatch(e -> e > finalMax || e < finalMin)) {
|
|
|
+ if (Arrays.stream(Arrays.stream(arr).toArray()).map(StringUtils::handleNull).map(item -> new BigDecimal(item).setScale(8, RoundingMode.HALF_UP).doubleValue()).noneMatch(e -> e > finalMax || e < finalMin)) {
|
|
|
result.add(obj);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- List<Object> l2 = datas.stream().filter(StringUtils::isNumber).map(StringUtils::handleNull).map(Double::parseDouble).filter(e -> e <= finalMax && e >= finalMin).collect(Collectors.toList());
|
|
|
+ List<Object> l2 = datas.stream().filter(StringUtils::isNumber).map(StringUtils::handleNull).map(item -> new BigDecimal(item).setScale(8, RoundingMode.HALF_UP).doubleValue()).filter(e -> e <= finalMax && e >= finalMin).collect(Collectors.toList());
|
|
|
if (ListUtils.isNotEmpty(l2)) {
|
|
|
result.addAll(l2);
|
|
|
}
|