|
|
@@ -52,8 +52,14 @@ public class CompareUtil {
|
|
|
if (compRet2 < 0 || compRet2 == 0) {
|
|
|
ret2 = true;
|
|
|
}
|
|
|
-
|
|
|
ret = ret1 && ret2;
|
|
|
+ } else if (EnumWarnRuleOp.NO_BETWEEN.equal(opCode)) {
|
|
|
+ // 当前值不在[min, max]范围内
|
|
|
+ String[] value = targetValue.split("-");
|
|
|
+ BigDecimal min = new BigDecimal(value[0]);
|
|
|
+ BigDecimal max = new BigDecimal(value[1]);
|
|
|
+ BigDecimal current = new BigDecimal(currentValue);
|
|
|
+ ret = current.compareTo(min) < 0 || current.compareTo(max) > 0;
|
|
|
}
|
|
|
return ret;
|
|
|
}
|