教师阅卷

sexam/src/main/resources/mapper/paper/EPaperCorrectTeacherMapper.xml

         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
         left join e_paper_correctclass pc on p.epid = pc.epid
-        left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
+        left join e_paper_student_question psq on psq.classid=pc.classid and psq.eptqid=pq.eptqid
         where pc.teacherid=#{teacherid} and pq.ctype in(3,13,14,15) group by p.epid
         union
         select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
-        left join e_paper_student_question psq on psq.epid = pq.epid and psq.qorder=pq.qorder
+        left join e_paper_student_question psq on psq.eptqid=pq.eptqid
         where pq.teacherid=#{teacherid} group by p.epid)a left join e_subject es on a.esid = es.esid
         left join e_base eb on es.examid = eb.examid
         where a.tjnum!=a.pynum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
         left join e_paper_correctclass pc on p.epid = pc.epid
-        left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
+        left join e_paper_student_question psq on psq.classid=pc.classid and psq.eptqid=pq.eptqid
         where pc.teacherid=#{teacherid} and pq.ctype in(3,13,14,15) group by p.epid
         union
         select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
-        left join e_paper_student_question psq on psq.epid = pq.epid and psq.qorder=pq.qorder
+        left join e_paper_student_question psq on psq.eptqid=pq.eptqid
         where pq.teacherid=#{teacherid} group by p.epid)a left join e_subject es on a.esid = es.esid
         left join e_base eb on es.examid = eb.examid
         where a.tjnum>0 and a.tjnum=a.pynum