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

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

      * @return com.xhkjedu.sstudy.vo.paper.QuestionAnalyzeVo
      **/
     public QuestionAnalyzeVo getQuestionDetailAnalyze(AnalyzeQuestionVo question) {
-        QuestionAnalyzeVo analyze = paperAnalyzeMapper.getQuestionDetailAnalyze(question);
         String questionpid = question.getQuestionpid();
         String questionid = question.getQuestionid();
-        if(N_Utils.isEmpty(questionpid)) question.setQuestionpid(questionid);
+        if(N_Utils.isEmpty(questionpid)) {
+            question.setQuestionpid(questionid);
+            questionpid=questionid;
+        }
+        QuestionAnalyzeVo analyze = paperAnalyzeMapper.getQuestionDetailAnalyze(question);
         if (!questionpid.equals(questionid)) {
             List<Map> sonqlist = questionMapper.listSonQuestionsForDetail(questionpid);
             analyze.setSonqlist(sonqlist);

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

                 q.setMhashear(mt.getHashear());
                 q.setMhearfile(mt.getHearfile());
                 q.setMqlevel(mt.getQlevel());
+                q.setMctype(mt.getCtype());
             }
         }
         return list;

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

     private String hearfile;//听力题文件地址
     private Integer qlevel;//试题级别1单题2母题
     private Integer mqlevel;//母题试题级别1单题2母题
+    private Integer mctype;//母题处理题型
     private Integer sorder;//子题排序
     private String questionpid;//母题id
     private String qn;//显示题号

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

         ,(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
-            ,'qtypename',fq.qtypename,'hashear',fq.hashear,'hearfile',fq.hearfile,'qlevel',fq.qlevel)
+            ,'qtypename',fq.qtypename,'hashear',fq.hashear,'hearfile',fq.hearfile,'qlevel',fq.qlevel,'ctype',fq.ctype)
         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

sstudy/src/main/resources/mapper/question/QuestionClassMapper.xml

 <mapper namespace="com.xhkjedu.sstudy.mapper.question.QuestionClassMapper">
     <!--作业统计按题-->
     <select id="getQuestionAnalyze" resultType="com.xhkjedu.sstudy.model.question.TQuestionClass">
-        select ptq.questionid,ptq.ptqorder qorder,ptq.ptqscore qscore,sum(ifnull(psq.stuscore,0))stuscore,ptq.schoolid,q.qtypeid
+        select ptq.questionpid,ptq.ptqorder qorder,ptq.mscore qscore,sum(ifnull(psq.stuscore,0))stuscore,ptq.schoolid,ptq.mqtypeid qtypeid
         ,(select count(*) from t_paper_student ps where ps.paperid=#{paperid} and ps.classid=#{classid}
         <if test="qctype==3">and locate(concat('"',ptq.questionid,'"'),ps.questionids)>0</if>)stunum
         from t_paper_qtype_question ptq left join t_question q on ptq.questionid=q.questionid
         left join t_paper_student_question psq on ptq.paperid = psq.paperid and ptq.questionid=psq.questionid and psq.classid=#{classid}
         where ptq.paperid=#{paperid}
-        group by ptq.questionid having stunum!=0 order by ptq.ptqorder
+        group by ptq.ptqorder having stunum!=0 order by ptq.ptqorder
     </select>
     <!--答题卡作业统计按题-->
     <select id="getSQuestionAnalyze" resultType="com.xhkjedu.sstudy.model.question.TQuestionClass">