Bladeren bron

修改调卷规则代码

chenken 8 jaren geleden
bovenliggende
commit
45987a8d3b
1 gewijzigde bestanden met toevoegingen van 5 en 3 verwijderingen
  1. 5 3
      cqb-paper/src/main/java/com/qmth/cqb/paper/service/ExtractConfigServiceImpl.java

+ 5 - 3
cqb-paper/src/main/java/com/qmth/cqb/paper/service/ExtractConfigServiceImpl.java

@@ -129,13 +129,15 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 		if(paperMap.isEmpty()){
 			throw new RuntimeException("抽取试卷失败");
 		}
-		Paper paper = paperMap.get("group_code");
+		Paper paper = paperMap.get(group_code);
+		if(paper==null){
+			throw new RuntimeException("抽取试卷失败");
+		}
 		//根据规则中设置的试卷重新组卷得到新试卷
     	Paper newPaper = this.recombinationPaper(paper, 
 						        				 extractConfig.getScrambling_the_question_order(), 
 						        				 extractConfig.getScrambling_the_option_order());
-    	PaperDto paperDto = getPaperDtoByPaper(newPaper);
-		return paperDto;
+		return getPaperDtoByPaper(newPaper);
 	}
 	
 	@Override