Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -33,12 +33,13 @@
         select es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,es.esstate
         ,ep.correcttype,es.esid,ep.epid,ep.ptype
         ,(select count(*) from e_subject_invigilate ei where ei.esid=es.esid)jkjsnum
-        ,count(case when eps.sstate=3 then eps.epsid else null end)qknum
-        ,count(case when eps.sstate=2 then eps.epsid else null end)tjnum
-        ,ifnull(truncate(count(case when eps.checked=2 then eps.epsid else null end)*100/
-        count(case when eps.sstate=2 then eps.epsid else null end),0),0)pyrate
+        ,count(distinct case when eps.sstate=3 then eps.epsid else null end)qknum
+        ,count(distinct case when eps.sstate=2 then eps.epsid else null end)tjnum
+        ,ifnull(truncate(count(case when psq.answered=1 AND psq.checked=2 then psq.epsqid else null end)*100/
+                         count(case when psq.answered=1 then psq.epsqid else null end),2),0)pyrate
         from e_subject es left join e_paper ep on es.esid = ep.esid
         left join e_paper_student eps on ep.epid = eps.epid
+        left join e_paper_student_question psq on psq.epid=ep.epid and psq.ctype in(3,13,14,15)
         where es.examid=#{examid}
         group by es.esid
     </select>