错题集题号

sstudy/src/main/java/com/xhkjedu/sstudy/model/question/TQuestionClass.java

@@ -47,6 +47,8 @@ public class TQuestionClass extends BaseBean {
     //是否是听力题0不是1是
     private Integer hashear=0;
 
+    private String qn;//题号
+
     @Transient
     //学生总得分
     private Double stuscore;

sstudy/src/main/java/com/xhkjedu/sstudy/model/question/TQuestionStudent.java

@@ -71,6 +71,8 @@ public class TQuestionStudent extends BaseBean {
     //是否是听力题0不是1是
     private Integer hashear=0;
 
+    private String qn;//题号
+
     @Transient
     //开始时间
     private Integer starttime;

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

@@ -66,4 +66,6 @@ public class QuestionClassVo {
 
     //听力题文件地址
     private String hearfile;
+
+    private String qn;//题号
 }

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

@@ -79,4 +79,6 @@ public class QuestionStudentVo {
 
     //听力题文件地址
     private String hearfile;
+
+    private String qn;//题号
 }

sstudy/src/main/resources/mapper/paper/PaperAnalyzeMapper.xml

@@ -84,7 +84,7 @@
     </select>
     <!--作业统计按题-->
     <select id="getQuestionAnalyze" resultType="com.xhkjedu.sstudy.vo.paper.AnalyzeQuestionVo">
-        select ptq.paperid,ptq.questionid,ptq.ptqorder,ptq.questionpid
+        select ptq.paperid,ptq.questionid,ptq.ptqorder,ptq.qn,ptq.questionpid
         ,group_concat(distinct concat(ptq.qn,'_',ptq.questionid))qns
         ,ptq.mqtypename qtypename,ptq.mscore totalscore,truncate(avg(psq.stuscore),2)avgscore
         ,truncate(avg(psq.costtime),2)avgtime,min(psq.costtime)mintime,count(ps.psid)stunum

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.xhkjedu.sstudy.mapper.question.QuestionClassMapper">
     <!--作业统计按题-->
     <select id="getQuestionAnalyze" resultType="com.xhkjedu.sstudy.model.question.TQuestionClass">
-        select ptq.questionpid questionid,ptq.ptqorder qorder,ptq.mscore qscore,sum(ifnull(psq.stuscore,0))stuscore,ptq.schoolid,ptq.mqtypeid qtypeid
+        select ptq.questionpid questionid,ptq.ptqorder qorder,ptq.qn,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.questionpid,'"'),ps.questionids)>0</if>)stunum
         ,(select q.hashear from t_question q where q.questionid=ptq.questionpid)hashear
@@ -14,7 +14,7 @@
     </select>
     <!--答题卡作业统计按题-->
     <select id="getSQuestionAnalyze" resultType="com.xhkjedu.sstudy.model.question.TQuestionClass">
-        select ps.pscaid questionid,ps.psorder qorder,ps.psscore qscore,sum(ifnull(pss.stuscore,0))stuscore,ps.schoolid,ps.qtypeid
+        select ps.pscaid questionid,ps.psorder qorder,ps.qn,ps.psscore qscore,sum(ifnull(pss.stuscore,0))stuscore,ps.schoolid,ps.qtypeid
         ,(select count(*) from t_paper_student ps where ps.paperid=#{paperid} and ps.classid=#{classid})stunum
         from t_paper_scantron ps left join t_paper_student_scantron pss on ps.pscaid=pss.pscaid and pss.classid=#{classid}
         where ps.paperid=#{paperid}
@@ -32,7 +32,7 @@
     <!--章节班级错题列表-->
     <select id="directorList" resultType="com.xhkjedu.sstudy.vo.question.QuestionClassVo">
         select qc.qcid,qc.questionid,qc.qscore,qc.avgscore,qc.errorrate,qc.qctype,qc.qtypeid
-        ,concat(p.papername,'-第',qc.qorder,'题')qstem
+        ,concat(p.papername,'-第',qc.qn,'题')qstem
         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

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

@@ -9,7 +9,7 @@
     </select>
     <!--列表-->
     <select id="findAll" resultType="com.xhkjedu.sstudy.vo.question.QuestionStudentVo">
-        select qs.qsid,qs.questionid,qs.qscore,qs.stuscore,qs.scorerate,qs.qctype,qs.qorder,qs.qtypeid,qs.paperid
+        select qs.qsid,qs.questionid,qs.qscore,qs.stuscore,qs.scorerate,qs.qctype,qs.qorder,qs.qn,qs.qtypeid,qs.paperid
         from t_question_student qs left join t_paper p on qs.paperid=p.paperid
         where qs.studentid = #{qs.studentid} and delstate=0 and qs.subjectid=#{qs.subjectid}
         <if test="qs.starttime!=null and qs.starttime!=0">
@@ -41,8 +41,8 @@
 
     <!--//////////////////////////////////////////////学生WEB端//////////////////////////////////////////////-->
     <select id="listForWeb" resultType="com.xhkjedu.sstudy.vo.question.QuestionStudentVo">
-        select qs.qsid,qs.questionid,qs.qscore,qs.stuscore,qs.scorerate,qs.qctype,qs.qorder
-        ,qs.qtypeid,concat(p.papername,'-第',qs.qorder,'题')qstem
+        select qs.qsid,qs.questionid,qs.qscore,qs.stuscore,qs.scorerate,qs.qctype,qs.qorder,qs.qn
+        ,qs.qtypeid,concat(p.papername,'-第',qs.qn,'题')qstem
         from t_question_student qs left join t_paper p on qs.paperid=p.paperid
         where qs.studentid=#{question.studentid} and qs.delstate=0
         <if test="question.starttime!=null and question.starttime!=0">
@@ -68,7 +68,7 @@
     </select>
     <!--更新错题信息-->
     <update id="updateQuestion">
-        update t_question_student set qtypeid=#{qs.qtypeid},qorder=#{qs.qorder}
+        update t_question_student set qtypeid=#{qs.qtypeid},qorder=#{qs.qorder},qn=#{qs.qn}
         ,qscore=#{qs.qscore},stuscore=#{qs.stuscore},scorerate=#{qs.scorerate},paperid=#{qs.paperid}
         ,errornum=errornum+1,delstate=0,handletime=#{qs.handletime},stujson=#{qs.stujson}
         where qsid=#{qs.qsid}
@@ -97,7 +97,7 @@
     </select>
     <select id="detail" resultMap="questionResult">
         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
+        ,qs.qsid,qs.qscore,qs.stuscore,qs.stujson,qs.paperid,qs.studentid,qs.qorder,qs.qn
         ,(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
         from t_question_student qs left join t_question q on qs.questionid=q.questionid
@@ -105,7 +105,7 @@
     </select>
     <!--附件试题详情-->
     <select id="sdetail" resultType="com.xhkjedu.sstudy.vo.question.QuestionStudentVo">
-        select concat(p.papername,'-第',qs.qorder,'题')qstem,p.hearfile
+        select concat(p.papername,'-第',qs.qn,'题')qstem,p.hearfile
         ,ps.psanswer qanswer,ps.ctype,qs.qsid,qs.qscore,qs.stuscore,qs.stujson,qs.paperid
         from t_question_student qs left join t_paper_scantron ps on qs.questionid=ps.pscaid
         left join t_paper p on p.paperid=qs.paperid
@@ -116,7 +116,7 @@
     <select id="listQuestions" resultType="com.xhkjedu.sstudy.model.question.TQuestionStudent">
         <if test="qctype==1 or qctype==3">
             select q.studentid,ptq.mscore qscore,sum(q.stuscore)stuscore,ptq.questionpid questionid
-            ,ptq.mqtypeid qtypeid,ptq.ptqorder qorder,max(q.checked)checked
+            ,ptq.mqtypeid qtypeid,ptq.ptqorder qorder,q.qn,max(q.checked)checked
             ,concat('[',group_concat(json_object('questionid',q.questionid,'qn',q.qn,'qorder',q.qorder,'answertype',q.answertype
             ,'useranswer',q.useranswer,'useranswertxt',q.useranswertxt,'converted',q.converted
             ,'qscore',q.qscore,'stuscore',q.stuscore,'ctype',ptq.ctype)),']')stujson
@@ -126,7 +126,7 @@
             group by ptq.questionpid,q.studentid,q.classid HAVING checked=1 and qscore!=stuscore
         </if>
         <if test="qctype==2">
-            select q.studentid,q.qscore,q.stuscore,q.pscaid questionid,ps.qtypeid,ps.psorder qorder
+            select q.studentid,q.qscore,q.stuscore,q.pscaid questionid,ps.qtypeid,ps.psorder qorder,q.qn
             ,concat('[',group_concat(json_object('questionid',q.pscaid,'qn',q.qn,'qorder',q.qorder,'answertype',q.answertype
             ,'useranswer',q.useranswer,'useranswertxt',q.useranswertxt,'converted',q.converted
             ,'qscore',q.qscore,'stuscore',q.stuscore,'ctype',ps.ctype)),']')stujson