Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -501,6 +501,7 @@ public class PaperService {
                     q = mquestions.stream().filter(mq -> mq.getQuestionid().equals(questionpid)).findFirst().orElse(null);
                     double score = list.stream().mapToDouble(QuestionVo::getScore).sum();
                     q.setScore(score);
+                    q.setPtqorder(tq.getPtqorder());
                     q.setSonqlist(JSON.parseArray(JSON.toJSONString(list), Map.class));
                 } else {
                     q = tq;

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentService.java

@@ -140,6 +140,7 @@ public class PaperStudentService {
                 q.setMqoption(mt.getQoption());
                 q.setMqanswer(mt.getQanswer());
                 q.setMqanalyze(mt.getQanalyze());
+                q.setMqtypename(mt.getQtypename());
             }
         }
         return list;

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paperstudent/PaperStudentQuestionVo.java

@@ -96,4 +96,5 @@ public class PaperStudentQuestionVo {
     private String mqoption;//母题选项
     private String mqanswer;//母题答案
     private String mqanalyze;//母题解析
+    private String mqtypename;//母题题型名称
 }

sstudy/src/main/resources/mapper/paperstudent/PaperStudentQuestionMapper.xml

@@ -9,7 +9,7 @@
         ,(CASE WHEN psq.checked=1 AND psq.stuscore=psq.qscore THEN 1 ELSE 2 END)corrected
         ,(CASE WHEN q.ctype IN(16,17) THEN JSON_LENGTH(q.qoption) ELSE 0 END)qoptioncount
         ,(CASE WHEN q.questionpid IS NULL THEN ''
-        ELSE (SELECT json_object('qstem',fq.qstem,'qoption',fq.qoption,'qanswer',fq.qanswer,'qanalyze',fq.qanalyze)
+        ELSE (SELECT json_object('qstem',fq.qstem,'qoption',fq.qoption,'qanswer',fq.qanswer,'qanalyze',fq.qanalyze,'qtypename',fq.qtypename)
         FROM t_question fq WHERE fq.questionid=q.questionpid) END)mqstem
         FROM t_paper_student_question psq LEFT JOIN t_question q ON psq.questionid=q.questionid
         LEFT JOIN t_user u ON psq.studentid=u.userid