Merge remote-tracking branch 'origin/master' into ywx

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperController.java

@@ -127,6 +127,7 @@ public class PaperController {
         }
     }
 
+    //保存题库作业
     @PostMapping("/saveq")
     public ResultVo saveQuestionPaper(@RequestBody TPaper paper) {
         String questionStr = paper.getQuestionStr();

sstudy/src/main/java/com/xhkjedu/sstudy/model/paper/TPaperQtypeQuestion.java

@@ -40,6 +40,18 @@ public class TPaperQtypeQuestion extends BaseBean {
 
     private String qn;//显示题号
 
+    //复合题对应母题id
+    private String questionpid;
+
+    //复合题母题分值
+    private double mscore;
+
+    //母题题型id
+    private String mqtypeid;
+
+    //母题题型名称
+    private String mqtypename;
+
     @Transient
     //处理题型1单选题2多选题3主观题4判断对错5判断✔6判断TF7完形填空8阅读理解
     private Integer ctype;

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -363,6 +363,10 @@ public class PaperService {
                     ptq.setCreatetime(N_Utils.getSecondTimestamp());
                     ptq.setSchoolid(schoolid);
                     ptq.setQn(ptq.getPtqorder().toString());
+                    ptq.setQuestionpid(q.getQuestionid());
+                    ptq.setMscore(q.getScore());
+                    ptq.setMqtypeid(q.getQtypeid());
+                    ptq.setMqtypename(q.getQtypename());
                     ptqs.add(ptq);
                 } else {
                     Integer sorder = 1;
@@ -377,6 +381,10 @@ public class PaperService {
                         ptq.setCreatetime(N_Utils.getSecondTimestamp());
                         ptq.setSchoolid(schoolid);
                         ptq.setQn(qorder+"."+sorder);
+                        ptq.setQuestionpid(q.getQuestionid());
+                        ptq.setMscore(q.getScore());
+                        ptq.setMqtypeid(q.getQtypeid());
+                        ptq.setMqtypename(q.getQtypename());
                         sorder++;
                         ptqs.add(ptq);
                     }