|
@@ -126,7 +126,6 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
|
|
questionInfoTestDTO.setQuestionType(2);
|
|
questionInfoTestDTO.setQuestionType(2);
|
|
questionInfoTestDTO.setNum(60);
|
|
questionInfoTestDTO.setNum(60);
|
|
List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
|
|
List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
|
|
- list1.addAll(list2);
|
|
|
|
return list1;
|
|
return list1;
|
|
} else if (questionInfoTestDTO.getSubject()==4) {
|
|
} else if (questionInfoTestDTO.getSubject()==4) {
|
|
questionInfoTestDTO.setQuestionType(1);
|
|
questionInfoTestDTO.setQuestionType(1);
|
|
@@ -134,7 +133,6 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
|
|
List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
|
|
List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
|
|
questionInfoTestDTO.setQuestionType(2);
|
|
questionInfoTestDTO.setQuestionType(2);
|
|
questionInfoTestDTO.setNum(10);
|
|
questionInfoTestDTO.setNum(10);
|
|
- System.out.println(list1.size());
|
|
|
|
List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
|
|
List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
|
|
questionInfoTestDTO.setQuestionType(3);
|
|
questionInfoTestDTO.setQuestionType(3);
|
|
questionInfoTestDTO.setNum(10);
|
|
questionInfoTestDTO.setNum(10);
|
|
@@ -142,7 +140,6 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
|
|
List<QuestionInfo> list3 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
|
|
List<QuestionInfo> list3 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
|
|
list1.addAll(list2);
|
|
list1.addAll(list2);
|
|
list1.addAll(list3);
|
|
list1.addAll(list3);
|
|
- System.out.println(list3.size());
|
|
|
|
return list1;
|
|
return list1;
|
|
}
|
|
}
|
|
return null;
|
|
return null;
|