|
@@ -155,11 +155,36 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
|
|
logger.info("根据新试卷 paperId:"+newPaper.getId()+"组装PaperDto后返回");
|
|
logger.info("根据新试卷 paperId:"+newPaper.getId()+"组装PaperDto后返回");
|
|
PaperDto paperDto = getPaperDtoByPaper(newPaper);
|
|
PaperDto paperDto = getPaperDtoByPaper(newPaper);
|
|
paperDto.setBasePaperId(basePaperId);
|
|
paperDto.setBasePaperId(basePaperId);
|
|
|
|
+ paperDto.setAllQbjectiveQuestion(checkIsAllQbjectiveQuestion(basePaperId));
|
|
returnMap.put("paperDto",paperDto);
|
|
returnMap.put("paperDto",paperDto);
|
|
logger.info("调卷完成");
|
|
logger.info("调卷完成");
|
|
return returnMap;
|
|
return returnMap;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public boolean checkIsAllQbjectiveQuestion(String paperId) {
|
|
|
|
+ Paper paper = paperRepo.findOne(paperId);
|
|
|
|
+ List<PaperDetailUnit> paperDetailUnits = paperDetailUnitRepo.findByPaper(paper);
|
|
|
|
+ for(PaperDetailUnit paperDetailUnit:paperDetailUnits){
|
|
|
|
+ Question question = paperDetailUnit.getQuestion();
|
|
|
|
+ //填空或问答
|
|
|
|
+ if(question.getQuestionType()==QuesStructType.FILL_BLANK_QUESTION
|
|
|
|
+ ||question.getQuestionType()==QuesStructType.TEXT_ANSWER_QUESTION){
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ if(question.getQuestionType()==QuesStructType.NESTED_ANSWER_QUESTION){
|
|
|
|
+ List<Question> subQuestions = question.getSubQuestions();
|
|
|
|
+ for(Question subQuestion:subQuestions){
|
|
|
|
+ if(subQuestion.getQuestionType()==QuesStructType.FILL_BLANK_QUESTION
|
|
|
|
+ ||subQuestion.getQuestionType()==QuesStructType.TEXT_ANSWER_QUESTION){
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Map<String, String> makePaperByConfig(String extractConfigId) {
|
|
public Map<String, String> makePaperByConfig(String extractConfigId) {
|
|
Map<String, String> finishedPaperIdMap = new HashMap<String, String>();
|
|
Map<String, String> finishedPaperIdMap = new HashMap<String, String>();
|