小题分析改为单题母题分析

sexam/src/main/java/com/xhkjedu/sexam/model/reportclass/ERclassQuestion.java

@@ -28,6 +28,8 @@ public class ERclassQuestion extends BaseBean {
     //试题主键id
     private Integer eptqid;
 
+    private String questionid;//试题id(单题id,母题id)
+
     //序号
     private String qn;
 

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

@@ -189,7 +189,7 @@ public class EPaperQtypeService {
     }
 
     //保存试卷分析--题库
-    private void savePaperAnalyzeForQuestion(EPaper ePaper){
+    public void savePaperAnalyzeForQuestion(EPaper ePaper){
         //保存之前先清除之前的试卷分析
         ePaperAnalyzeMapper.deleteByEpid(ePaper.getEpid());
         //总体分析（主观题、客观题）
@@ -389,6 +389,7 @@ public class EPaperQtypeService {
                 qpoint.setOrder(dq.getQorder());
                 qpoint.setScore(dq.getScore());
                 qpoint.setQlevel(dq.getQlevel());
+                qpoint.setQuestionid(dq.getQuestionid());
                 if(qnstr == null){
                     qpoint.setQns(new String[]{dq.getQn()});
                 }else{
@@ -439,6 +440,8 @@ public class EPaperQtypeService {
                     qpoint.setName(pointmap.get("pointname").toString());
                     qpoint.setOrder(dq.getQorder());
                     qpoint.setQlevel(dq.getQlevel());
+                    qpoint.setQuestionid(dq.getQuestionid());
+
 
                     Map quesmap = new HashMap();//试题对应知识点
                     quesmap.put("pointid",pointmap.get("pointid").toString());
@@ -518,6 +521,7 @@ public class EPaperQtypeService {
         qtype.setOrder(dq.getQorder());
         qtype.setScore(dq.getScore());
         qtype.setQlevel(dq.getQlevel());
+        qtype.setQuestionid(dq.getQuestionid());
         if(qnstr == null){
             qtype.setQns(new String[]{dq.getQn()});
         }else{
@@ -539,6 +543,7 @@ public class EPaperQtypeService {
         qtype.setOrder(dq.getQorder());
         qtype.setScore(dq.getScore());
         qtype.setQlevel(dq.getQlevel());
+        qtype.setQuestionid(dq.getQuestionid());
         if(qnstr == null){
             qtype.setQns(new String[]{dq.getQn()});
         }else{

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java

@@ -1497,14 +1497,16 @@ public class EReportGenerateService {
                 List<Integer> eptqids = (List<Integer>) quesmap.get("eptqids");
                 Integer qlevel = Integer.parseInt(quesmap.get("qlevel").toString());
                 String order = quesmap.get("order").toString();//试题母题题号
+                String questionid = quesmap.get("questionid").toString();
                 List<String> qnslist = (List<String>) quesmap.get("qns");
                 qns = qns + order + ",";
 
                 //获取集合中对应子题集合的数据
                 List<EPaperStudentQuestion> qgstulist = null;
-                Integer eptqid = eptqids.get(0);
+                Integer eptqid = null;
                 if (qlevel == 1) {
                     //单题时直接为试题id
+                    eptqid = eptqids.get(0);
                     Integer teptqid = eptqid;
                     qgstulist = paperstulist.stream().filter(s -> teptqid.equals(s.getEptqid())).collect(Collectors.toList());
                 } else {
@@ -1591,6 +1593,7 @@ public class EReportGenerateService {
                     ercq.setSubjectid(examPaperClassVo.getSubjectid());
                     ercq.setEpid(examPaperClassVo.getEpid());
                     ercq.setEptqid(eptqid);
+                    ercq.setQuestionid(questionid);
                     ercq.setQn(String.join(",", qnslist));
                     ercq.setQorder(Integer.parseInt(order));
                     ercq.setClassscore(qcstuscore);

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/QuestionOrderVo.java

@@ -22,6 +22,8 @@ public class QuestionOrderVo {
     //试题题号（单题、母题） （子题不占题号）
     private Integer order;
 
+    private String questionid;//试题id（单题id,母题id）
+
     //试题题号对应子题在试卷中id(单题时数组长度为1)
     private Integer[] eptqids;