Browse Source

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

tags/正式版本
王宁 2 years ago
parent
commit
2eeec1a252

+ 4
- 4
sexam/src/main/resources/mapper/paper/EPaperCorrectTeacherMapper.xml View File

@@ -11,7 +11,7 @@
11 11
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
12 12
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
13 13
         left join e_paper_correctclass pc on p.epid = pc.epid
14
-        left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
14
+        left join e_paper_student_question psq on psq.classid=pc.classid and psq.eptqid=pq.eptqid
15 15
         where pc.teacherid=#{teacherid} and pq.ctype in(3,13,14,15) group by p.epid
16 16
         union
17 17
         select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
@@ -19,7 +19,7 @@
19 19
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
20 20
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
21 21
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
22
-        left join e_paper_student_question psq on psq.epid = pq.epid and psq.qorder=pq.qorder
22
+        left join e_paper_student_question psq on psq.eptqid=pq.eptqid
23 23
         where pq.teacherid=#{teacherid} group by p.epid)a left join e_subject es on a.esid = es.esid
24 24
         left join e_base eb on es.examid = eb.examid
25 25
         where a.tjnum!=a.pynum
@@ -34,7 +34,7 @@
34 34
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
35 35
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
36 36
         left join e_paper_correctclass pc on p.epid = pc.epid
37
-        left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
37
+        left join e_paper_student_question psq on psq.classid=pc.classid and psq.eptqid=pq.eptqid
38 38
         where pc.teacherid=#{teacherid} and pq.ctype in(3,13,14,15) group by p.epid
39 39
         union
40 40
         select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
@@ -42,7 +42,7 @@
42 42
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
43 43
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
44 44
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
45
-        left join e_paper_student_question psq on psq.epid = pq.epid and psq.qorder=pq.qorder
45
+        left join e_paper_student_question psq on psq.eptqid=pq.eptqid
46 46
         where pq.teacherid=#{teacherid} group by p.epid)a left join e_subject es on a.esid = es.esid
47 47
         left join e_base eb on es.examid = eb.examid
48 48
         where a.tjnum>0 and a.tjnum=a.pynum

Loading…
Cancel
Save