批阅完善

smarking/src/main/resources/mapper/papercheck/MsPaperCheckTeacherTaskMapper.xml

@@ -147,47 +147,47 @@
     <select id="listByTeacher" resultMap="teacherResultMap">
         <if test="correcttype==1">
             select pct.teacherid,u.username as teachername
-            ,if(pc.dispenseway=2,count(psb.mpsqid)*pc.checktype
-            ,count(if(psb.firstcid=pct.teacherid or psb.secondcid=pct.teacherid,psb.mpsqid,null))
-            ) as totalNum
-            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime>0) or (psb.secondcid=pct.teacherid and psb.secondctime>0),psb.mpsqid,null)) as checkedNum
-            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime=0) or (psb.secondcid=pct.teacherid and psb.secondctime=0),psb.mpsqid,null)) as uncheckedNum
+            ,count(distinct psb.mpsqid) as totalNum
+            ,count(distinct if(psb.firstcid=pct.teacherid and psb.checked=3,psb.mpsqid,null)) as checkedNum
+            ,count(distinct if((psb.firstcid=pct.teacherid and psb.checked=2) or psb.checked=1,psb.mpsqid,null)) as uncheckedNum
             ,psb.mptqid as mblockid,psb.qorder,psb.qn
             from ms_paper_check_teacher pct left join t_user u on u.userid = pct.teacherid
             left join ms_paper_check pc on pct.mblockid = pc.mblockid and pct.mpid = pc.mpid
             left join ms_paper_student_question psb on pct.mpid = psb.mpid
             inner join ms_class c on c.examid=psb.examid and c.subjectid=psb.subjectid and c.classid=pct.mblockid
-            where pct.mpid=#{mpid} and psb.ctype in (3, 13, 14, 15)
+            where pct.mpid=#{mpid} and psb.ctype in (3, 13, 14, 15) and psb.answered=1
             group by pct.teacherid,psb.mptqid
             order by teachername,psb.qorder,psb.qn
         </if>
         <if test="correcttype==2">
             select pct.teacherid,u.username as teachername
-            ,if(pc.dispenseway=2,count(psb.mpsqid)*pc.checktype
-            ,count(if(psb.firstcid=pct.teacherid or psb.secondcid=pct.teacherid,psb.mpsqid,null))
-            ) as totalNum
-            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime>0) or (psb.secondcid=pct.teacherid and psb.secondctime>0),psb.mpsqid,null)) as checkedNum
-            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime=0) or (psb.secondcid=pct.teacherid and psb.secondctime=0),psb.mpsqid,null)) as uncheckedNum
+            ,if(pc.dispenseway=2,count(distinct psb.mpsqid),count(distinct pctt.mpcttid)) as totalNum
+            ,count(distinct if(pctt.checkstate=3,pctt.mpcttid,null)) as checkedNum
+            ,if(pc.dispenseway=2,count(distinct if(psb.checked=1 or pctt.checkstate!=3
+            or (pc.checktype=2 and (psb.firstcid is null or psb.secondcid is null)),psb.mpsqid,null))
+            ,count(distinct if(pctt.checkstate!=3,pctt.mpcttid,null))) as uncheckedNum
             ,pct.mblockid,psb.qorder,psb.qn
             from ms_paper_check_teacher pct left join t_user u on u.userid = pct.teacherid
             left join ms_paper_check pc on pct.mblockid = pc.mblockid and pct.mpid = pc.mpid
-            left join ms_paper_student_question psb on psb.mptqid = pct.mblockid and pct.mpid = psb.mpid
+            left join ms_paper_student_question psb on pct.mblockid = psb.mptqid and pct.mpid = psb.mpid and psb.answered=1
+            left join ms_paper_check_teacher_task pctt on pctt.mpid = pct.mpid and pctt.mpsbid=psb.mpsqid and pctt.teacherid = pct.teacherid
             where pct.mpid=#{mpid}
             group by pct.teacherid,pct.mblockid
             order by teachername,psb.qorder,psb.qn
         </if>
         <if test="correcttype==3">
             select pct.teacherid,u.username as teachername
-            ,if(pc.dispenseway=2,count(psb.mpsbid)*pc.checktype
-                ,count(if(psb.firstcid=pct.teacherid or psb.secondcid=pct.teacherid,psb.mpsbid,null))
-             ) as totalNum
-            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime>0) or (psb.secondcid=pct.teacherid and psb.secondctime>0),psb.mpsbid,null)) as checkedNum
-            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime=0) or (psb.secondcid=pct.teacherid and psb.secondctime=0),psb.mpsbid,null)) as uncheckedNum
+            ,if(pc.dispenseway=2,count(psb.mpsbid),count(distinct pctt.mpcttid)) as totalNum
+            ,count(distinct if(pctt.checkstate=3,pctt.mpcttid,null)) as checkedNum
+            ,if(pc.dispenseway=2,count(distinct if(psb.checked=1 or pctt.checkstate!=3
+            or (pc.checktype=2 and (psb.firstcid is null or psb.secondcid is null)),psb.mpsbid,null))
+            ,count(distinct if(pctt.checkstate!=3,pctt.mpcttid,null))) as uncheckedNum
             ,pct.mblockid,pb.blockname
             from ms_paper_check_teacher pct left join t_user u on u.userid = pct.teacherid
             left join ms_paper_block pb on pct.mblockid = pb.mblockid and pct.mpid = pb.mpid
             left join ms_paper_check pc on pct.mblockid = pc.mblockid and pct.mpid = pc.mpid
             left join ms_paper_student_block psb on psb.mblockid = pct.mblockid and pct.mpid = psb.mpid
+            left join ms_paper_check_teacher_task pctt on pctt.mpid = pct.mpid and pctt.mpsbid=psb.mpsbid and pctt.teacherid = pct.teacherid
             where pct.mpid=#{mpid}
             group by pct.teacherid,pct.mblockid
             order by teachername,pb.blockorder
@@ -257,18 +257,19 @@
         <if test="param.correcttype==3">
             select pb.blockname,pb.blockorder,pb.bqnum
             ,pc.mblockid,pc.checktype,pc.dispenseway,pc.numtype
-            ,count(distinct psb.mpsbid) as totalNum
+            ,count(psb.mpsbid) as totalNum
             ,count(distinct if(psb.checked=3,psb.mpsbid,null)) as totalCheckedNum
             ,count(distinct if(psb.checked in(1,2),psb.mpsbid,null)) as totalUncheckedNum
-            ,count(distinct if((psb.firstcime is not null and psb.firstcid=#{param.handleid}) or (psb.secondctime is not null and psb.secondcid=#{param.handleid}),psb.mpsbid,null)) as myCheckedNum
-            ,count(distinct if(((psb.firstcime is null and psb.firstcid=#{param.handleid})
-            or (psb.secondctime is null and psb.secondcid=#{param.handleid}) or psb.checked=1)
-            ,psb.mpsbid,null)) as myUncheckedNum
+            ,count(distinct if(pctt.checkstate=3,pctt.mpcttid,null)) as myCheckedNum
+            ,if(pc.dispenseway=2,count(distinct if(psb.checked=1 or pctt.checkstate!=3
+            or (pc.checktype=2 and (psb.firstcid is null or psb.secondcid is null)),psb.mpsbid,null))
+            ,count(distinct if(pctt.checkstate!=3,pctt.mpcttid,null))) as myUncheckedNum
             ,(select group_concat(pbbq.bqn separator '、') from ms_paper_block_question pbbq where pbbq.mblockid = pb.mblockid) as bqn
             from ms_paper_check pc left join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid
-            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or psb.checked=1) and psb.checked!=0
+            and psb.checked!=0
             inner join ms_paper_block pb on pc.mblockid = pb.mblockid and pb.mpid = pc.mpid
             inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid and pct.teacherid = #{param.handleid}
+            left join ms_paper_check_teacher_task pctt on pctt.mpid = pct.mpid and pctt.mpsbid=psb.mpsbid and pctt.teacherid = pct.teacherid
             where pc.mpid=#{param.mpid}
             group by pb.mblockid
             order by pb.blockorder
@@ -279,14 +280,15 @@
             ,count(distinct psb.mpsqid) as totalNum
             ,count(distinct if(psb.checked=3,psb.mpsqid,null)) as totalCheckedNum
             ,count(distinct if(psb.checked in(1,2),psb.mpsqid,null)) as totalUncheckedNum
-            ,count(distinct if((psb.firstcime>0 and psb.firstcid=#{param.handleid}) or (psb.secondctime>0 and psb.secondcid=#{param.handleid}),psb.mpsqid,null)) as myCheckedNum
-            ,count(distinct if(((psb.firstcime is null and psb.firstcid=#{param.handleid})
-            or (psb.secondctime is null and psb.secondcid=#{param.handleid}) or psb.checked=1)
-            ,psb.mpsqid,null)) as myUncheckedNum
+            ,count(distinct if(pctt.checkstate=3,pctt.mpcttid,null)) as myCheckedNum
+            ,if(pc.dispenseway=2,count(distinct if(psb.checked=1 or pctt.checkstate!=3
+            or (pc.checktype=2 and (psb.firstcid is null or psb.secondcid IS NULL)),psb.mpsqid,null))
+            ,count(distinct if(pctt.checkstate!=3,pctt.mpcttid,null))) as myUncheckedNum
             from ms_paper_check pc left join ms_paper_student_question psb on psb.mptqid = pc.mblockid and psb.mpid = pc.mpid
-            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or psb.checked=1) and psb.checked!=0
+            and psb.checked!=0 and psb.answered=1
             inner join ms_paper_qtype_question pb on pc.mblockid = pb.mptqid and pb.mpid = pc.mpid
             inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid and pct.teacherid = #{param.handleid}
+            left join ms_paper_check_teacher_task pctt on pctt.mpid = pct.mpid and pctt.mpsbid=psb.mpsqid and pctt.teacherid = pct.teacherid
             where pc.mpid=#{param.mpid}
             group by pb.mptqid
             order by pb.mptqid
@@ -294,18 +296,18 @@
         <if test="param.correcttype==1">
             select c.classname,c.classtype
             ,pc.mblockid,pc.checktype,pc.dispenseway,pc.numtype
-            ,count(distinct psb.mpsqid)*pc.checktype as totalNum
+            ,count(distinct psb.mpsqid) as totalNum
             ,count(distinct if(psb.checked=3,psb.mpsqid,null)) as totalCheckedNum
             ,count(distinct if(psb.checked in(1,2),psb.mpsqid,null)) as totalUncheckedNum
-            ,count(distinct if((psb.firstcime is not null and psb.firstcid=#{param.handleid}) or (psb.secondctime is not null and psb.secondcid=#{param.handleid}),psb.mpsqid,null)) as myCheckedNum
-            ,count(distinct if(((psb.firstcime is null and psb.firstcid=#{param.handleid})
-            or (psb.secondctime is null and psb.secondcid=#{param.handleid}) or psb.checked=1)
-            ,psb.mpsqid,null)) as myUncheckedNum
+            ,count(distinct if(pctt.checkstate=3,pctt.mpcttid,null)) as myCheckedNum
+            ,if(pc.dispenseway=2,count(distinct if(psb.checked=1 or pctt.checkstate!=3
+            or (pc.checktype=2 and (psb.firstcid is null or psb.secondcid IS NULL)),psb.mpsqid,null))
+            ,count(distinct if(pctt.checkstate!=3,pctt.mpcttid,null))) as myUncheckedNum
             from ms_paper_check pc inner join ms_class c on pc.mblockid = c.classid
             inner join ms_class_student cs on c.examid=cs.examid and c.subjectid=cs.subjectid and pc.mblockid=cs.classid
             inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid and pct.teacherid = #{param.handleid}
-            left join ms_paper_student_question psb on psb.mpid = pc.mpid and psb.studentid=cs.studentid
-            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or psb.checked=1) and psb.checked!=0
+            left join ms_paper_student_question psb on psb.mpid = pc.mpid and psb.studentid=cs.studentid and psb.checked!=0 and psb.answered=1
+            left join ms_paper_check_teacher_task pctt on pctt.mpid = pct.mpid and pctt.mpsbid=psb.mpsqid and pctt.teacherid = pct.teacherid
             where pc.mpid=#{param.mpid} and c.subjectid=#{param.subjectid}
             group by c.classid
             order by c.mcid
@@ -366,6 +368,9 @@
         from ms_paper_check pc inner join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid
         inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid = pc.mpid and pct.teacherid = #{param.handleid}
         where pc.checkstate=1 and psb.checked in(1,2) and pc.mpid=#{param.mpid}
+        <if test="param.mblockid!=null and param.mblockid!=0">
+            and pc.mblockid=#{param.mblockid}
+        </if>
         group by pc.mblockid
         order by pc.mpcid
     </select>
@@ -499,6 +504,9 @@
         from ms_paper_check pc inner join ms_paper_student_question psb on psb.mptqid = pc.mblockid and psb.mpid = pc.mpid
         inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid = pc.mpid and pct.teacherid = #{param.handleid}
         where pc.checkstate=1 and psb.checked in(1,2) and pc.mpid=#{param.mpid}
+        <if test="param.mblockid!=null and param.mblockid!=0">
+            and pc.mblockid=#{param.mblockid}
+        </if>
         group by pc.mblockid
         order by pc.mpcid
     </select>
@@ -539,6 +547,12 @@
         from ms_paper_check pc inner join ms_paper_student_question psb on psb.mpid = pc.mpid
         inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid = pc.mpid and pct.teacherid = #{param.handleid}
         where pc.checkstate=1 and psb.checked in(1,2) and pc.mpid=#{param.mpid}
+        <if test="param.mblockid!=null and param.mblockid!=0">
+            and pc.mblockid=#{param.mblockid}
+        </if>
+        <if test="param.mptqid!=null and param.mptqid!=0">
+            and psb.mptqid=#{param.mptqid}
+        </if>
         group by pc.mblockid
         order by pc.mpcid
     </select>