|
@@ -869,7 +869,7 @@ public class TRmCalpointValueServiceImpl extends BaseServiceImpl<TRmCalpointValu
|
|
|
acb = new BigDecimal(Double.toString(dval));
|
|
|
|
|
|
//根据跳变范围上下随机浮动并取整
|
|
|
- if(tRmCalpoint!=null && tRmCalpoint.getCalcMod()!=null && "FLOAT".equals(tRmCalpoint.getCalcMod())){
|
|
|
+ if(tRmCalpoint!=null && tRmCalpoint.getCalcMod()!=null && "RANDOM".equals(tRmCalpoint.getCalcMod().trim().toUpperCase())){
|
|
|
if(tRmCalpoint.getRangeVal()!=null){
|
|
|
int max = new BigDecimal(dval).divide(tRmCalpoint.getRangeVal(),0,BigDecimal.ROUND_HALF_UP).intValue();
|
|
|
int min = new BigDecimal(dval).multiply(tRmCalpoint.getRangeVal()).setScale(0,BigDecimal.ROUND_HALF_UP).intValue();
|