Commit 5ebd189e by zhangkb

修改单位得分计算判断指标目录逻辑

parent b57be7db
...@@ -356,7 +356,7 @@ public class ScoreRuleService { ...@@ -356,7 +356,7 @@ public class ScoreRuleService {
if(StringUtils.isBlank(driveIndDef.getIsUnitCalScore()) || if(StringUtils.isBlank(driveIndDef.getIsUnitCalScore()) ||
"1".equals(driveIndDef.getIsUnitCalScore())) { "1".equals(driveIndDef.getIsUnitCalScore())) {
//如果指标是该指标分类下的 //如果指标是该指标分类下的
if(driveIndDef.getCatalogIdPath().indexOf(catalogIdPath)>=0) { if(catalogIdPath.indexOf(driveIndDef.getCatalogIdPath())>=0) {
//得分类型:0 指标值直接参与计算 //得分类型:0 指标值直接参与计算
if("0".equals(scoreRule.getScoreType())) { if("0".equals(scoreRule.getScoreType())) {
if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue()) if(!"NaN".equals(calResult.getValue()) && !"Infinite".equals(calResult.getValue())
......
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