|
|
@@ -614,6 +614,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
|
|
|
|
|
|
@Override
|
|
|
public Map<String, Object> importExcelQuestionV2NotInBank(List<QuestionImportV2> questionList, Boolean isUpdateSupport, String operName) {
|
|
|
+ System.out.println(questionList);
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
if (Validator.isNull(questionList) || questionList.size() == 0) {
|
|
|
throw new CustomException("导入数据不能为空!");
|
|
|
@@ -823,15 +824,18 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
|
|
|
if(Validator.isNotEmpty(entity.getContent())&&i>startIndex){
|
|
|
break;
|
|
|
}
|
|
|
+ if(Validator.isEmpty(entity.getOption())){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
QuestionChildAddBo addBo = new QuestionChildAddBo();
|
|
|
addBo.setContent(entity.getOption());
|
|
|
addBo.setOptionsId(j);
|
|
|
optionsList.add(addBo);
|
|
|
if("是".equals(entity.getAnswer())){
|
|
|
answerList.add(j);
|
|
|
- if(type==1){ //单选
|
|
|
+ /*if(type==1){ //单选
|
|
|
break;
|
|
|
- }
|
|
|
+ }*/
|
|
|
}
|
|
|
j++;
|
|
|
}
|