教师阅卷

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

@@ -22,25 +22,30 @@
         left join e_paper_student_question psq on psq.epid = pq.epid and psq.qorder=pq.qorder
         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 group by a.epid
+        where a.tjnum!=a.pynum
     </select>
     <!--已阅卷列表-->
     <select id="listMarked" resultType="java.util.Map">
         select a.*,eb.examname,eb.gradeid,eb.examtype,es.sdate,es.begintime,es.endtime,es.subjectname
+        ,100 pgrate
         from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
         ,group_concat(distinct pq.qorder order by pq.qorder)qorders,group_concat(distinct pc.classid)classids
+        ,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_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
         where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15) group by p.epid
         union
         select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
         ,group_concat(distinct pq.qorder order by pq.qorder)qorders,0 classids
+        ,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
         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
-        left join e_paper_student ps on a.epid=ps.epid
-        group by a.epid
-        having count(case when ps.checked!=2 then ps.epsid else null end)=0
+        where a.tjnum>0 and a.tjnum=a.pynum
     </select>
     <!--随机获取一条待批阅试题-->
     <select id="getCorrectQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
@@ -78,13 +83,13 @@
     <!--批阅试题-->
     <update id="correctQuestion">
         update e_paper_student_question
-        set stuscore=#{psq.stuscore},psq.checked=1
+        set stuscore=#{psq.stuscore},checked=1
         ,checkid=#{psq.checkid},checktime=unix_timestamp()
         ,good=#{psq.good},bad=#{psq.bad}
         <if test="psq.stuanswer!=null and psq.stuanswer!=''">
             and stuanswer=#{psq.stuanswer}
         </if>
-        where psq.epsqid=#{psq.epsqid}
+        where epsqid=#{psq.epsqid}
     </update>
     <!--学生未批改试题数量-->
     <select id="getNotCorrect" resultType="java.lang.Integer">