分数是空字符串的bug
This commit is contained in:
+7
-6
@@ -71,24 +71,25 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
|
|||||||
}else {
|
}else {
|
||||||
value=evaluation.getProcessNode();
|
value=evaluation.getProcessNode();
|
||||||
}
|
}
|
||||||
|
String evaluationScore = ObjectUtils.isEmpty(evaluation.getScore()) ? "0" : evaluation.getScore();
|
||||||
switch (value){
|
switch (value){
|
||||||
case "征求意见":
|
case "征求意见":
|
||||||
score=Double.valueOf(evaluation.getScore()) * 0.3;
|
score=Double.valueOf(evaluationScore) * 0.3;
|
||||||
break;
|
break;
|
||||||
case "技术委员会评审、评审意见修改":
|
case "技术委员会评审、评审意见修改":
|
||||||
score=Double.valueOf(evaluation.getScore()) * 0.4;
|
score=Double.valueOf(evaluationScore) * 0.4;
|
||||||
break;
|
break;
|
||||||
case "重新技术委员会评审、评审意见修改":
|
case "重新技术委员会评审、评审意见修改":
|
||||||
score=Double.valueOf(evaluation.getScore()) * 0.4;
|
score=Double.valueOf(evaluationScore) * 0.4;
|
||||||
break;
|
break;
|
||||||
case "标准化复审":
|
case "标准化复审":
|
||||||
score=Double.valueOf(evaluation.getScore()) * 0.15;
|
score=Double.valueOf(evaluationScore) * 0.15;
|
||||||
break;
|
break;
|
||||||
case "标准法规部高级经理审核":
|
case "标准法规部高级经理审核":
|
||||||
score=Double.valueOf(evaluation.getScore()) * 0.15;
|
score=Double.valueOf(evaluationScore) * 0.15;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default: score=Double.valueOf(evaluation.getScore());
|
default: score=Double.valueOf(evaluationScore);
|
||||||
}
|
}
|
||||||
last.add(score);
|
last.add(score);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user