错题集返回听力文件

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

@@ -5,7 +5,6 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 @Table(name = "t_paper_qtype_question")
 @Data
@@ -52,7 +51,6 @@ public class TPaperQtypeQuestion extends BaseBean {
     //母题题型名称
     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

@@ -445,6 +445,7 @@ public class PaperService {
                     ptq.setMscore(q.getScore());
                     ptq.setMqtypeid(q.getQtypeid());
                     ptq.setMqtypename(q.getQtypename());
+                    ptq.setCtype(q.getCtype());
                     ptqs.add(ptq);
                 } else {
                     Integer sorder = 1;
@@ -463,6 +464,7 @@ public class PaperService {
                         ptq.setMscore(q.getScore());
                         ptq.setMqtypeid(q.getQtypeid());
                         ptq.setMqtypename(q.getQtypename());
+                        ptq.setCtype((Integer) sq.get("ctype"));
                         sorder++;
                         ptqs.add(ptq);
                     }

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionClassService.java

@@ -147,6 +147,8 @@ public class QuestionClassService {
                 q.setQoption(vo.getQoption());
                 q.setQtypename(vo.getQtypename());
                 q.setCount(vo.getCount());
+                q.setHashear(vo.getHashear());
+                q.setHearfile(vo.getHearfile());
             } else if (qctype == 2) {
                 QuestionClassVo vo = scantrons.stream().filter(tq -> tq.getQuestionid().equals(q.getQuestionid())).findFirst().orElse(null);
                 q.setCtype(vo.getCtype());
@@ -230,7 +232,7 @@ public class QuestionClassService {
             if(hearnum!=null && hearnum >0){
                 SubjectQuestiontypeVo qt = new SubjectQuestiontypeVo();
                 qt.setQtypename("听力题");
-                qt.setQtypename("tlt");
+                qt.setQtypeid("tlt");
                 list.add(0,qt);
             }
         }

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionStudentService.java

@@ -97,6 +97,8 @@ public class QuestionStudentService {
                 q.setQstem(vo.getQstem());
                 q.setQoption(vo.getQoption());
                 q.setQtypename(vo.getQtypename());
+                q.setHashear(vo.getHashear());
+                q.setHearfile(vo.getHearfile());
             } else if (qctype == 2) {
                 QuestionClassVo vo = scantrons.stream().filter(tq -> tq.getQuestionid().equals(q.getQuestionid())).findFirst().orElse(null);
                 q.setCtype(vo.getCtype());
@@ -209,7 +211,7 @@ public class QuestionStudentService {
             if(hearnum!=null && hearnum >0){
                 SubjectQuestiontypeVo qt = new SubjectQuestiontypeVo();
                 qt.setQtypename("听力题");
-                qt.setQtypename("tlt");
+                qt.setQtypeid("tlt");
                 list.add(0,qt);
             }
         }
@@ -231,6 +233,8 @@ public class QuestionStudentService {
                 q.setQstem(vo.getQstem());
                 q.setQoption(vo.getQoption());
                 q.setQtypename(vo.getQtypename());
+                q.setHashear(vo.getHashear());
+                q.setHearfile(vo.getHearfile());
             } else if (qctype == 2) {
                 QuestionClassVo vo = scantrons.stream().filter(tq -> tq.getQuestionid().equals(q.getQuestionid())).findFirst().orElse(null);
                 q.setCtype(vo.getCtype());

sstudy/src/main/java/com/xhkjedu/sstudy/vo/question/QuestionClassDetailVo.java

@@ -64,6 +64,12 @@ public class QuestionClassDetailVo {
     private List<Map> sonqlist;//子题
 
     private Integer classid;//班级id
+
+    //是否是听力题0不是1是
+    private Integer hashear;
+
+    //听力题文件地址
+    private String hearfile;
 }
 
 /**

sstudy/src/main/java/com/xhkjedu/sstudy/vo/question/QuestionClassVo.java

@@ -60,4 +60,10 @@ public class QuestionClassVo {
 
     //班级错题id
     private Integer qcid;
+
+    //是否是听力题0不是1是
+    private Integer hashear;
+
+    //听力题文件地址
+    private String hearfile;
 }

sstudy/src/main/java/com/xhkjedu/sstudy/vo/question/QuestionStudentVo.java

@@ -73,4 +73,10 @@ public class QuestionStudentVo {
     private Integer complexity;
 
     private List<Map> sonqlist;//子题
+
+    //是否是听力题0不是1是
+    private Integer hashear;
+
+    //听力题文件地址
+    private String hearfile;
 }

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

@@ -61,7 +61,8 @@
     </select>
     <!--根据试题id获取试题信息-->
     <select id="getQuestionById" resultType="com.xhkjedu.sstudy.vo.question.QuestionClassVo">
-        select q.questionid,q.ctype,q.qstem,q.qoption,q.qtypename,q.count from t_question q where
+        select q.questionid,q.ctype,q.qstem,q.qoption,q.qtypename,q.count,q.hashear,q.hearfile
+        from t_question q where
         <foreach collection="questionids" item="questionid" index="index" separator="or">
             q.questionid=#{questionid}
         </foreach>
@@ -76,7 +77,7 @@
     <!--知识点班级错题列表-->
     <select id="pointList" resultType="com.xhkjedu.sstudy.vo.question.QuestionClassVo">
         select qc.qcid,qc.questionid,qc.qscore,qc.avgscore,qc.errorrate,qc.qctype
-        ,q.ctype,q.qstem,q.qoption,q.qtypeid,q.qtypename,q.count
+        ,q.ctype,q.qstem,q.qoption,q.qtypeid,q.qtypename,q.count,q.hashear,q.hearfile
         from (select max(qcid)qcid,questionid from t_question_class where classid=#{question.classid} group by
         questionid)a
         left join t_question_class qc on a.qcid=qc.qcid
@@ -134,6 +135,8 @@
         <result property="ytjnum" column="ytjnum"></result>
         <result property="wtjnum" column="wtjnum"></result>
         <result property="pointname" column="pointname"></result>
+        <result property="hashear" column="hashear"></result>
+        <result property="hearfile" column="hearfile"></result>
         <collection property="stus" ofType="com.xhkjedu.sstudy.vo.question.AnswerStu">
             <result property="section" column="section"></result>
             <result property="stunum" column="stunum"></result>
@@ -155,7 +158,7 @@
     </select>
     <!--客观题详情-->
     <select id="objectiveDetail" resultMap="questionResult">
-        select qc.qscore,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.complexity
+        select qc.qscore,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.complexity,q.hashear,q.hearfile
         ,qc.qctype,qc.avgscore,qc.errorrate,qc.paperid,qc.classid,qc.questionid
         ,psq.useranswer section,count(psq.psqid)stunum,psq.stuscore,group_concat(u.username order by convert(u.username using gbk) separator '  ')stuname
         ,(select group_concat(p.pointname separator '  ') from t_question_point qp
@@ -180,7 +183,7 @@
     </select>
     <!--主观题详情-->
     <select id="subjectiveDetail" resultMap="questionResult">
-        select qc.qscore,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.complexity
+        select qc.qscore,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.complexity,q.hashear,q.hearfile
         ,qc.qctype,qc.avgscore,qc.errorrate,qc.paperid,qc.classid,qc.questionid
         ,psq.stuscore,u.username stuname
         ,(select count(*) from t_paper_student ps where ps.paperid=qc.paperid and ps.classid=qc.classid)wtjnum
@@ -252,7 +255,7 @@
         where paperid=#{question.paperid} and classid=#{question.classid} and questionpid=#{question.questionid}
     </select>
     <select id="complexDetail" resultMap="complexResult">
-        select qc.qscore,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.complexity
+        select qc.qscore,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.complexity,q.hashear,q.hearfile
         ,qc.qctype,qc.avgscore,qc.errorrate,qc.paperid,qc.classid,qc.questionid
         ,(select group_concat(p.pointname separator '  ') from t_question_point qp
         left join t_point p on qp.pointid = p.pointid where qp.questionid=q.questionid)pointname

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

@@ -96,7 +96,7 @@
         order by answertime desc
     </select>
     <select id="detail" resultMap="questionResult">
-        select q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.questionid
+        select q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.questionid,q.hashear,q.hearfile
         ,qs.qsid,qs.qscore,qs.stuscore,qs.stujson,qs.paperid,qs.studentid,qs.qorder
         ,(select group_concat(p.pointname separator '  ') from t_question_point qp
         left join t_point p on qp.pointid = p.pointid where qp.questionid=qs.questionid)pointname
@@ -118,7 +118,7 @@
             ,ptq.mqtypeid qtypeid,ptq.ptqorder qorder,max(q.checked)checked
             ,concat('[',group_concat(json_object('questionid',q.questionid,'qn',q.qn,'answertype',q.answertype
             ,'useranswer',q.useranswer,'useranswertxt',q.useranswertxt,'converted',q.converted
-            ,'qscore',q.qscore,'stuscore',q.stuscore)),']')stujson
+            ,'qscore',q.qscore,'stuscore',q.stuscore,'ctype',ptq.ctype)),']')stujson
             ,(select tq.hashear from t_question tq where tq.questionid=ptq.questionpid)hashear
             from t_paper_student_question q left join t_paper_qtype_question ptq on q.questionid=ptq.questionid and q.paperid=ptq.paperid
             where q.paperid=#{paperid} and q.classid=#{classid}
@@ -128,7 +128,7 @@
             select q.studentid,q.qscore,q.stuscore,q.pscaid questionid,ps.qtypeid,ps.psorder qorder
             ,concat('[',group_concat(json_object('questionid',q.pscaid,'qn',q.qorder,'answertype',q.answertype
             ,'useranswer',q.useranswer,'useranswertxt',q.useranswertxt,'converted',q.converted
-            ,'qscore',q.qscore,'stuscore',q.stuscore)),']')stujson
+            ,'qscore',q.qscore,'stuscore',q.stuscore,'ctype',ps.ctype)),']')stujson
             from t_paper_student_scantron q left join t_paper_scantron ps on q.pscaid=ps.pscaid
             where q.paperid=#{paperid} and q.classid=#{classid} and q.checked=1 and q.stuscore!=q.qscore
             group by q.pscaid,q.studentid,q.classid