|
@@ -68,6 +68,16 @@ public class ScoreCalculateUtil {
|
|
// 任选给分
|
|
// 任选给分
|
|
if (ObjectivePolicy.ALL.equals(question.getObjectivePolicy())) {
|
|
if (ObjectivePolicy.ALL.equals(question.getObjectivePolicy())) {
|
|
score = answer.length() == 0 || answer.equals("#") ? 0 : question.getTotalScore();
|
|
score = answer.length() == 0 || answer.equals("#") ? 0 : question.getTotalScore();
|
|
|
|
+ } else if(ObjectivePolicy.PROPORTION.equals(question.getObjectivePolicy())){
|
|
|
|
+ for (int i = 0; i < answer.length(); i++) {
|
|
|
|
+ if (!question.getAnswer().contains(String.valueOf(answer.charAt(i)))) {
|
|
|
|
+ correct = false;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (correct) {
|
|
|
|
+ score = DoubleUtil.div(DoubleUtil.mul(question.getTotalScore(),answer.length()),question.getAnswer().length(),2);
|
|
|
|
+ }
|
|
} else if(ObjectivePolicy.CUSTOMIZE.equals(question.getObjectivePolicy())){
|
|
} else if(ObjectivePolicy.CUSTOMIZE.equals(question.getObjectivePolicy())){
|
|
for (int i = 0; i < answer.length(); i++) {
|
|
for (int i = 0; i < answer.length(); i++) {
|
|
if (!question.getAnswer().contains(String.valueOf(answer.charAt(i)))) {
|
|
if (!question.getAnswer().contains(String.valueOf(answer.charAt(i)))) {
|