fix

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

@@ -1970,7 +1970,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         }
                     }
                     content = dealTxt(content);
-            //        System.out.println(content);
+                    System.out.println("新行开始"+content);
                     if (content.startsWith("#")) { //导入结束
                         break;
                     }
@@ -1985,7 +1985,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         type = 5;
                     }
                     //单选,多选
-                    if(type==1||type==2){
+                    if((type==1||type==2)&&!answerStatus){
                         if(content.startsWith(cIndex+".")||content.startsWith(nIndex+".")){
                             if(content.startsWith(nIndex+".")){
                                 indexKey =nIndex+".";
@@ -2004,13 +2004,34 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         }
                         //第一个选项
                         if(content.startsWith("A.")) {
-                            QuestionAddBo cAddBo = allQues.get(indexKey);
-                            QuestionChildAddBo bo1;
-                            bo1 = new QuestionChildAddBo();
-                            bo1.setOptionsId(1L);
-                            bo1.setImgUrl(imgUrl);
-                            bo1.setContent(content.replace("A.", ""));
-                            cAddBo.getOptionsList().add(bo1);
+                            String[] strArr = content.split("\t");
+                            if(strArr.length==2){ //AB一起
+                                String str1 = strArr[0];
+                                QuestionAddBo cAddBo = allQues.get(indexKey);
+                                QuestionChildAddBo bo1;
+                                bo1 = new QuestionChildAddBo();
+                                bo1.setOptionsId(1L);
+                                bo1.setImgUrl(imgUrl);
+                                bo1.setContent(str1.replace("A.", ""));
+                                cAddBo.getOptionsList().add(bo1);
+
+                                String str2 = strArr[1];
+                                QuestionChildAddBo bo2;
+                                bo2 = new QuestionChildAddBo();
+                                bo2.setOptionsId(2L);
+                                bo2.setImgUrl(imgUrl);
+                                bo2.setContent(str2.replace("B.", ""));
+                                QuestionAddBo cAddBo2 = allQues.get(indexKey);
+                                cAddBo2.getOptionsList().add(bo2);
+                            }else{
+                                QuestionAddBo cAddBo = allQues.get(indexKey);
+                                QuestionChildAddBo bo1;
+                                bo1 = new QuestionChildAddBo();
+                                bo1.setOptionsId(1L);
+                                bo1.setImgUrl(imgUrl);
+                                bo1.setContent(content.replace("A.", ""));
+                                cAddBo.getOptionsList().add(bo1);
+                            }
 
                         }
                         //第二个选项
@@ -2025,19 +2046,41 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         }
                         //第三个选项
                         if (content.startsWith("C.")) {
-                            QuestionChildAddBo bo1;
-                            bo1 = new QuestionChildAddBo();
-                            bo1.setOptionsId(2L);
-                            bo1.setImgUrl(imgUrl);
-                            bo1.setContent(content.replace("C.", ""));
-                            QuestionAddBo cAddBo = allQues.get(indexKey);
-                            cAddBo.getOptionsList().add(bo1);
+                            String[] strArr = content.split("\t");
+                            if(strArr.length==2){
+                                String str1 = strArr[0];
+                                QuestionAddBo cAddBo = allQues.get(indexKey);
+                                QuestionChildAddBo bo1;
+                                bo1 = new QuestionChildAddBo();
+                                bo1.setOptionsId(3L);
+                                bo1.setImgUrl(imgUrl);
+                                bo1.setContent(str1.replace("C.", ""));
+                                cAddBo.getOptionsList().add(bo1);
+
+                                String str2 = strArr[1];
+                                QuestionChildAddBo bo2;
+                                bo2 = new QuestionChildAddBo();
+                                bo2.setOptionsId(4L);
+                                bo2.setImgUrl(imgUrl);
+                                bo2.setContent(str2.replace("D.", ""));
+                                QuestionAddBo cAddBo2 = allQues.get(indexKey);
+                                cAddBo2.getOptionsList().add(bo2);
+                            }else{
+                                QuestionChildAddBo bo1;
+                                bo1 = new QuestionChildAddBo();
+                                bo1.setOptionsId(3L);
+                                bo1.setImgUrl(imgUrl);
+                                bo1.setContent(content.replace("C.", ""));
+                                QuestionAddBo cAddBo = allQues.get(indexKey);
+                                cAddBo.getOptionsList().add(bo1);
+                            }
+
                         }
                         //第四个选项
                         if (content.startsWith("D.")) {
                             QuestionChildAddBo bo1;
                             bo1 = new QuestionChildAddBo();
-                            bo1.setOptionsId(2L);
+                            bo1.setOptionsId(4L);
                             bo1.setImgUrl(imgUrl);
                             bo1.setContent(content.replace("D.", ""));
                             QuestionAddBo cAddBo = allQues.get(indexKey);
@@ -2045,19 +2088,41 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                         }
                         //第五个选项
                         if (content.startsWith("E.")) {
-                            QuestionChildAddBo bo1;
-                            bo1 = new QuestionChildAddBo();
-                            bo1.setOptionsId(2L);
-                            bo1.setImgUrl(imgUrl);
-                            bo1.setContent(content.replace("E.", ""));
-                            QuestionAddBo cAddBo = allQues.get(indexKey);
-                            cAddBo.getOptionsList().add(bo1);
+                            String[] strArr = content.split("\t");
+                            if(strArr.length==2){
+                                String str1 = strArr[0];
+                                QuestionAddBo cAddBo = allQues.get(indexKey);
+                                QuestionChildAddBo bo1;
+                                bo1 = new QuestionChildAddBo();
+                                bo1.setOptionsId(5L);
+                                bo1.setImgUrl(imgUrl);
+                                bo1.setContent(str1.replace("E.", ""));
+                                cAddBo.getOptionsList().add(bo1);
+
+                                String str2 = strArr[1];
+                                QuestionChildAddBo bo2;
+                                bo2 = new QuestionChildAddBo();
+                                bo2.setOptionsId(6L);
+                                bo2.setImgUrl(imgUrl);
+                                bo2.setContent(str2.replace("F.", ""));
+                                QuestionAddBo cAddBo2 = allQues.get(indexKey);
+                                cAddBo2.getOptionsList().add(bo2);
+                            }else{
+                                QuestionChildAddBo bo1;
+                                bo1 = new QuestionChildAddBo();
+                                bo1.setOptionsId(5L);
+                                bo1.setImgUrl(imgUrl);
+                                bo1.setContent(content.replace("E.", ""));
+                                QuestionAddBo cAddBo = allQues.get(indexKey);
+                                cAddBo.getOptionsList().add(bo1);
+                            }
+
                         }
                         //第六个选项
                         if (content.startsWith("F.")) {
                             QuestionChildAddBo bo1;
                             bo1 = new QuestionChildAddBo();
-                            bo1.setOptionsId(2L);
+                            bo1.setOptionsId(6L);
                             bo1.setImgUrl(imgUrl);
                             bo1.setContent(content.replace("F.", ""));
                             QuestionAddBo cAddBo = allQues.get(indexKey);
@@ -2066,7 +2131,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                     }
 
                     //问答
-                    if(type==5){
+                    if(type==5&&!answerStatus){
                         if(alKeyList.contains(content)){
                             indexKey = content;
                             QuestionAddBo addBo = new QuestionAddBo();
@@ -2092,7 +2157,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                     }
 
                 }
-                System.out.println("结束");
                 System.out.println(allQues);
                 //遍历正文
                 int importSort = 1;