|
@@ -393,9 +393,17 @@ public class GenPaperService {
|
|
|
List<Question> subQuestions = question.getSubQuestions();
|
|
|
List<Double> subScoreList = new ArrayList<>();
|
|
|
if(subQuestions != null && subQuestions.size() > 0){
|
|
|
- for(Question subQuestion:subQuestions){
|
|
|
- double score = paperDetailUnit.getScore()/ subQuestions.size();
|
|
|
- subScoreList.add(CommonUtils.formatDouble(score));
|
|
|
+ int subQuesLen = subQuestions.size();
|
|
|
+ double subTotalScore = paperDetailUnit.getScore();
|
|
|
+ for(int j = 0;j < subQuesLen;j++){
|
|
|
+ double avgScore = subTotalScore / subQuestions.size();
|
|
|
+
|
|
|
+ double formatScore = CommonUtils.formatDoubleFloor(avgScore);
|
|
|
+ if(j == subQuesLen - 1){
|
|
|
+ subScoreList.add(subTotalScore - formatScore * j);
|
|
|
+ }else{
|
|
|
+ subScoreList.add(formatScore);
|
|
|
+ }
|
|
|
}
|
|
|
paperDetailUnit.setSubScoreListNew(subScoreList);
|
|
|
}
|