学生报告获取到已结束的科目

sexam/src/main/resources/mapper/exam/ESubjectMapper.xml

@@ -99,7 +99,7 @@
     <select id="listSubjectAndPnum" resultType="java.util.Map">
         select es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,es.teacherid,p.pnum,p.ptype,p.pscore
         from e_subject es left join e_paper p on es.esid=p.esid
-        where es.examid=#{examid} order by es.esid
+        where es.examid=#{examid} and es.pstate=2 order by es.esid
     </select>
     <!--考试科目选择列表-->
     <select id="listSubjectForSel" resultType="java.util.Map">

sexam/src/main/resources/mapper/report/ERstudentMapper.xml

@@ -225,13 +225,13 @@
         </collection>
     </resultMap>
     <select id="listStudentSubjectErrorQues" resultMap="listStudentSubjectErrorQues">
-        select sq.subjectid,s.subjectname,p.ptype,sq.epsqid,sq.eptqid,q.questionid,q.qlevel,q.questionpid
+        select sq.subjectid,st.subjectname,p.ptype,sq.epsqid,sq.eptqid,q.questionid,q.qlevel,q.questionpid
         from e_paper_student_question sq
         left join t_question q on q.questionid=sq.questionid
-        left join t_subject s on sq.subjectid=s.subjectid
         left join t_question mq on q.questionpid=mq.questionid
         left join e_paper p on sq.epid=p.epid
-        where sq.examid=#{examid} and sq.studentid=#{studentid} and sq.stuscore &lt; sq.qscore group by sq.epsqid order by s.subjectorder
+        left join e_subject st on p.esid=st.esid
+        where sq.examid=#{examid} and sq.studentid=#{studentid} and st.pstate=2 and sq.stuscore &lt; sq.qscore group by sq.epsqid order by st.esid
     </select>
     <!--学生报告-错题集-学生科目下错题（题库）-->
     <select id="listStudentErrorQuestionsForTk" resultMap="listStudentQues">