|
|
@@ -141,17 +141,19 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
|
|
|
returnMap.put("errorMsg","该考试和课程下调卷规则中试卷不存在,请重新制定调卷规则");
|
|
|
return returnMap;
|
|
|
}
|
|
|
- Paper paper = paperMap.get(group_code);
|
|
|
- if(paper==null){
|
|
|
+ Paper basePaper = paperMap.get(group_code);
|
|
|
+ if(basePaper==null){
|
|
|
logger.info("该考试和课程下调卷规则中该类型试卷不存在,请检查调卷规则,调卷程序退出");
|
|
|
returnMap.put("errorMsg","该考试和课程下调卷规则中该类型试卷不存在,请重新制定调卷规则");
|
|
|
return returnMap;
|
|
|
}
|
|
|
- logger.info("将试卷:"+paper.getId()+"根据规则重新组卷");
|
|
|
- Paper newPaper = this.recombinationPaper(paper,
|
|
|
+ logger.info("将原始试卷:"+basePaper.getId()+"根据规则重新组卷");
|
|
|
+ Paper newPaper = this.recombinationPaper(basePaper,
|
|
|
extractConfig.getScrambling_the_question_order(),
|
|
|
extractConfig.getScrambling_the_option_order());
|
|
|
logger.info("根据新试卷 paperId:"+newPaper.getId()+"组装PaperDto后返回");
|
|
|
+ PaperDto paperDto = getPaperDtoByPaper(newPaper);
|
|
|
+ paperDto.setBasePaperId(basePaper.getId());
|
|
|
returnMap.put("paperDto", getPaperDtoByPaper(newPaper));
|
|
|
logger.info("调卷完成");
|
|
|
return returnMap;
|
chenken