试卷保存题号处理

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

         }
 
         List<EPaperQtype> qtypelist = paper.getQtypelist();
-        List<EPaperQtypeQuestion> questions = new ArrayList<>();
-        qtypelist.forEach(t -> {
-            questions.addAll(t.getQuestions());
-        });
-        long count = questions.stream().map(q -> q.getQn()).distinct().count();
-        if (count < questions.size()) return new ResultVo(1, "题号不能重复");
+        if (paper.getPtype() == 2) {
+            List<EPaperQtypeQuestion> questions = new ArrayList<>();
+            qtypelist.forEach(t -> {
+                questions.addAll(t.getQuestions());
+            });
+            long count = questions.stream().map(q -> q.getQn()).distinct().count();
+            if (count < questions.size()) return new ResultVo(1, "题号不能重复");
+        }
 
         //说明已经有改考试对应的试卷，删除试卷中试题，试卷分析
         ePaperQtypeMapper.deleteByEpid(espVo.getEpid());
         }
         ePaperQtypeMapper.insertList(qtypelist);//保存题型
         for(EPaperQtype qtype : qtypelist){
-            for(EPaperQtypeQuestion q : qtype.getQuestions()){
+            List<EPaperQtypeQuestion> questions = qtype.getQuestions();
+            Integer ctype = qtype.getCtype();
+            Integer ptype = epaper.getPtype();
+
+            for (int i = 0; i < questions.size(); i++) {
+                EPaperQtypeQuestion q=questions.get(i);
                 q.setEpid(epaper.getEpid());
                 q.setEptid(qtype.getId());
                 if(q.getOptionnum()==null){
                     q.setOptionnum(0);
                 }
-                if(epaper.getPtype() == 1){
-                    q.setQn(q.getQorder().toString());
+                Integer qorder = q.getQorder();
+                if (ptype == 1 && ctype != 11) {
+                    q.setQn(qorder.toString());
+                } else if (ptype == 1 && ctype == 11) {
+                    q.setQn(qorder + "." + (i + 1));
                 }
                 if(q.getCtype() == 14){
                     q.setGnum(900);//语文作文格数