修复套题小题分的bug

cqb-paper/src/main/java/com/qmth/cqb/paper/service/export/ExportPaperAbstractService.java

@@ -519,8 +519,10 @@ public abstract class ExportPaperAbstractService {
     				//判断小题是否为套题
     				if(paperDetailUnit.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION){
     					List<Question> subQuestions = paperDetailUnit.getQuestion().getSubQuestions();
-    					for(Question subQuestion:subQuestions){
-    						String questionBodyWord = appendScoreToQuestionBody(subQuestion.getQuesBodyWord(),subQuestion.getScore());
+    					for(int i = 0;i < subQuestions.size();i++){
+    						Question subQuestion = subQuestions.get(i);
+							double subScore = paperDetailUnit.getSubScoreList().get(i);
+    						String questionBodyWord = appendScoreToQuestionBody(subQuestion.getQuesBodyWord(),subScore);
     						subQuestion.setQuesBodyWord(questionBodyWord);
     					}
     				}else {
@@ -631,14 +633,14 @@ public abstract class ExportPaperAbstractService {
 		for (PaperDetailUnitExp unitExp : paperDetailUnitExps) {
 			//判断套路
 			if(unitExp.getQuestionType()==QuesStructType.NESTED_ANSWER_QUESTION){
-				List<Question> subQuestions = unitExp.getQuestion().getSubQuestions();
-				for(Question subQuestion:subQuestions){
-					scoreSet.add(subQuestion.getScore());
-				}
-				/*List<Double> subScoreList =  unitExp.getSubScoreList();
+//				List<Question> subQuestions = unitExp.getQuestion().getSubQuestions();
+//				for(Question subQuestion:subQuestions){
+//					scoreSet.add(subQuestion.getScore());
+//				}
+				List<Double> subScoreList =  unitExp.getSubScoreList();
 				for(Double score:subScoreList){
 					scoreSet.add(score);
-				}*/
+				}
 			}else{
 				scoreSet.add(unitExp.getScore());
 			}
@@ -1029,7 +1031,6 @@ public abstract class ExportPaperAbstractService {
 	/**
      * 检查客观题数量是否小于试卷结构导出设置的数量
      * @param paperExp
-     * @param objectiveDetails
      * @param questionTypeNums
      * @return
      */

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExtractConfigServiceImpl.java

@@ -475,6 +475,8 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 							subQuesDtos.get(m).setQuesAnswer(subQuesList.get(m).getQuesAnswer());
 						}
                         subQuesDtos.get(m).setNumber(m + 1);
+						//套题分数从小题类中取值
+						subQuesDtos.get(m).setScore(paperDetailUnit.getSubScoreList().get(m));
                     }
                     unitDto.setSubQuestions(subQuesDtos);
                 }
@@ -524,6 +526,8 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
                 subQuesDtos.get(m).setQuesOptions(quesOptionDtos);
                 subQuesDtos.get(m).setQuesAnswer(subQuesList.get(m).getQuesAnswer());
                 subQuesDtos.get(m).setNumber(m + 1);
+				//套题分数从小题类中取值
+				subQuesDtos.get(m).setScore(paperDetailUnit.getSubScoreList().get(m));
                 dto.setSubQuestions(subQuesDtos);
             }
         }