diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 6e3cea88..3900718c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -71,24 +71,25 @@ public class EsRevisePlanController extends BaseController { }else { value=evaluation.getProcessNode(); } + String evaluationScore = ObjectUtils.isEmpty(evaluation.getScore()) ? "0" : evaluation.getScore(); switch (value){ case "征求意见": - score=Double.valueOf(evaluation.getScore()) * 0.3; + score=Double.valueOf(evaluationScore) * 0.3; break; case "技术委员会评审、评审意见修改": - score=Double.valueOf(evaluation.getScore()) * 0.4; + score=Double.valueOf(evaluationScore) * 0.4; break; case "重新技术委员会评审、评审意见修改": - score=Double.valueOf(evaluation.getScore()) * 0.4; + score=Double.valueOf(evaluationScore) * 0.4; break; case "标准化复审": - score=Double.valueOf(evaluation.getScore()) * 0.15; + score=Double.valueOf(evaluationScore) * 0.15; break; case "标准法规部高级经理审核": - score=Double.valueOf(evaluation.getScore()) * 0.15; + score=Double.valueOf(evaluationScore) * 0.15; break; - default: score=Double.valueOf(evaluation.getScore()); + default: score=Double.valueOf(evaluationScore); } last.add(score); }