Commit 58565a04 by zhangkb

修改单位计算方法精确4位小数

parent 392695b1
package com.keymobile.indicators.service.hytobacco;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -254,11 +255,17 @@ public class ScoreRuleService {
//得分类型:0 指标值直接参与计算
if("0".equals(scoreRule.getScoreType()) ||
"2".equals(scoreRule.getScoreType())) {
objResult.setScoreValue(AviatorEvaluator.execute(calFormula).toString());
String scoreValue = String.format("%.4f",
new BigDecimal((Double)AviatorEvaluator.execute(calFormula)));
objResult.setScoreValue(scoreValue);
objResult.setImproveValue("0.0");
}else if("1".equals(scoreRule.getScoreType())) {//1 指标得分分数参与计算(综合评分和改善提升分开算)
objResult.setScoreValue(AviatorEvaluator.execute(calFormula).toString());
objResult.setImproveValue(AviatorEvaluator.execute(improveCalFormula).toString());
String scoreValue = String.format("%.4f",
new BigDecimal((Double)AviatorEvaluator.execute(calFormula)));
String improveValue = String.format("%.4f",
new BigDecimal((Double)AviatorEvaluator.execute(improveCalFormula)));
objResult.setScoreValue(scoreValue);
objResult.setImproveValue(improveValue);
}
}
return objResult;
......@@ -292,8 +299,8 @@ public class ScoreRuleService {
}
}
}
objResult.setScoreValue(String.valueOf(scoreValue));
objResult.setImproveValue(String.valueOf(improveValue));
objResult.setScoreValue(String.format("%.4f",new BigDecimal(scoreValue)));
objResult.setImproveValue(String.format("%.4f",new BigDecimal(improveValue)));
return objResult;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment