Browse Source

add 七大员

he2802 2 years ago
parent
commit
b3b56e2951

+ 7 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -727,8 +727,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                     }
                     }
                 }
                 }
             }
             }
+            String tempTxt = "";
             for(QuestionImportContent vo : question.getQuestionList()){
             for(QuestionImportContent vo : question.getQuestionList()){
-                if(Validator.isNotEmpty(vo.getContent())){
+                if(Validator.isNotEmpty(vo.getContent())&&!tempTxt.equals(vo.getContent())){
+                    tempTxt = vo.getContent();
                     type = findType(vo.getType());
                     type = findType(vo.getType());
                     if(isFirst){
                     if(isFirst){
                         isFirst = false;
                         isFirst = false;
@@ -818,10 +820,13 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         List<QuestionChildAddBo> optionsList = new ArrayList<>(); //题目选项
         List<QuestionChildAddBo> optionsList = new ArrayList<>(); //题目选项
         List<Long> answerList = new ArrayList<>(); //答案选项
         List<Long> answerList = new ArrayList<>(); //答案选项
         Long j = 1L;
         Long j = 1L;
+        String tempTxt = list.get(startIndex).getContent();
         for(int i = startIndex;i<list.size();i++){
         for(int i = startIndex;i<list.size();i++){
             QuestionImportContent entity = list.get(i);
             QuestionImportContent entity = list.get(i);
             if(Validator.isNotEmpty(entity.getContent())&&i>startIndex){
             if(Validator.isNotEmpty(entity.getContent())&&i>startIndex){
-                break;
+                if(!tempTxt.equals(entity.getContent())){
+                    break;
+                }
             }
             }
             if(Validator.isEmpty(entity.getOption())){
             if(Validator.isEmpty(entity.getOption())){
                 continue;
                 continue;