批阅完善

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsSubjectService.java

@@ -147,6 +147,7 @@ public class MsSubjectService {
         Map set = msSubjectMapper.getSet(examid, subjectid, exammode, monitored);
         set.put("exammode", exammode);
         set.put("monitored", monitored);
+        set.put("examstate", map.get("examstate"));
         return set;
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/service/papercheck/MsPaperCheckTeacherTaskService.java

@@ -70,14 +70,13 @@ public class MsPaperCheckTeacherTaskService {
             throw new ServiceException("该题块不存在");
         }
         Integer dispenseway = check.getDispenseway();
-        List<Map> list = msPaperCheckTeacherTaskMapper.detailByBlock(mpid, mblockid, dispenseway, check.getChecktype());
-        return setListNum(dispenseway, list);
+        return msPaperCheckTeacherTaskMapper.detailByBlock(mpid, mblockid, dispenseway, check.getChecktype());
     }
 
     //计算题块/试题的总数和未批阅的数量
     private List<Map> setListNum(Integer dispenseway, List<Map> list) {
         if (dispenseway.equals(2)) {
-            int totalNum = list.stream().mapToInt(m -> N_Utils.obj2Int(m.get("totalNum"))).sum();
+            int totalNum = N_Utils.obj2Int(list.get(0).get("totalNum"));
             int totalCheckedNum = list.stream().mapToInt(m -> N_Utils.obj2Int(m.get("checkedNum"))).sum();
             int uncheckedNum = totalNum - totalCheckedNum;
             for (Map m : list) {
@@ -324,8 +323,7 @@ public class MsPaperCheckTeacherTaskService {
             throw new ServiceException("该试题不存在");
         }
         Integer dispenseway = check.getDispenseway();
-        List<Map> list = msPaperCheckTeacherTaskMapper.detailByQuestion(mpid, mblockid, dispenseway, check.getChecktype());
-        return setListNum(dispenseway, list);
+        return msPaperCheckTeacherTaskMapper.detailByQuestion(mpid, mblockid, dispenseway, check.getChecktype());
     }
 
     /**

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

@@ -134,7 +134,7 @@
         ,if(pc.checktype=2,(select u.username from t_user u where u.userid=pc.arbitrateid),'') as arbitratename
         from ms_paper_qtype_question q left join ms_paper_check pc on q.mpid=pc.mpid
         inner join ms_paper p on q.mpid=p.mpid
-        where q.mpid=#{mpid} and q.ctype in(3,13,14,15)
+        where q.mpid=#{mpid} and q.qtype=2
     </select>
     <!--获取需要批阅的数量-->
     <select id="getNeedCheckNum" resultType="java.lang.Integer">

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

@@ -89,11 +89,11 @@
     </select>
     <select id="listByBlock" resultMap="blockResultMap">
         select pb.mblockid,pb.blockname,pb.bqscore,pb.blockorder,pb.bqnum
-        ,pc.checktype,pc.checkstate,count(pctt.mpcttid) as totalNum,count(if(pctt.checkstate=3,1,null)) as checkedNum
-        ,count(if(pctt.checkstate!=3,1,null))as uncheckedNum
+        ,pc.checktype,pc.checkstate,count(distinct psb.mpsbid) as totalNum,count(distinct if(psb.checked=3,psb.mpsbid,null)) as checkedNum
+        ,count(distinct if(psb.checked!=3,psb.mpsbid,null))as uncheckedNum
         ,(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_check_teacher_task pctt on pc.mpid = pctt.mpid
-        right join ms_paper_block pb on pc.mblockid = pb.mblockid
+        from ms_paper_check pc right join ms_paper_block pb on pc.mpid=pb.mpid and pc.mblockid = pb.mblockid
+        left join ms_paper_student_block psb on psb.mpid=pc.mpid and psb.mblockid=pc.mblockid
         where pb.mpid=#{mpid} and pb.blocktype= 2
         group by pb.mblockid
         order by pb.blockorder
@@ -109,24 +109,25 @@
             group by pctt.teacherid
         </if>
         <if test="dispenseway!=null and dispenseway==2">
-            select pct.teacherid,u.username as teachername
-            ,sum(ifnull(t.totalNum,0)) as totalNum,sum(ifnull(t.checkedNum,0)) as checkedNum,sum(ifnull(t.uncheckedNum,0)) as uncheckedNum
-            from(select psb.firstcid as teacherid,count(*) as totalNum,count(if(psb.firstcime is not null,1,null)) as checkedNum
-            ,count(if(psb.firstcime is null,1,null)) as uncheckedNum
-            from ms_paper_student_block psb
-            where psb.mpid=#{mpid} and psb.mblockid=#{mblockid} and psb.firstcid is not null
-            group by psb.firstcid
-            <if test="checktype!=null and checktype==2">
-                union
-                select psb.secondcid as teacherid,count(*) as totalNum,count(if(psb.secondctime is not null,1,null)) as checkedNum
-                ,count(if(psb.secondctime is null,1,null)) as uncheckedNum
-                from ms_paper_student_block psb
-                where psb.mpid=#{mpid} and psb.mblockid=#{mblockid} and psb.secondcid is not null
-                group by psb.secondcid
-            </if>)t
-            right join ms_paper_check_teacher pct on t.teacherid = pct.teacherid and pct.mblockid = #{mblockid} and pct.mpid = #{mpid}
-            left join t_user u on pct.teacherid=u.userid
+            select t.*,u.username as teachername
+            from(select pct.teacherid,count(distinct psb.mpsbid) as totalNum
+            ,count(distinct if(((psb.firstcid=pct.teacherid and psb.firstcime is not null)
+            <if test="checktype==2">
+                or (psb.secondcid=pct.teacherid and psb.secondctime is not null)
+            </if>
+            )
+            ,psb.mpsbid,null)) as checkedNum
+            ,count(distinct if(psb.checked=1 or (psb.checked=2 and ((psb.firstcid=pct.teacherid and psb.firstcime is null)
+            <if test="checktype==2">
+                or (psb.secondcid=pct.teacherid and psb.secondctime is null)
+                or (psb.firstcid!=pct.teacherid and psb.secondcid is null)
+                or (psb.secondcid!=pct.teacherid and psb.firstcid is null)
+            </if>
+            )),psb.mpsbid,null)) as uncheckedNum
+            from ms_paper_check_teacher pct left join ms_paper_student_block psb on pct.mpid = psb.mpid and pct.mblockid = psb.mblockid
+            where pct.mpid=#{mpid} and pct.mblockid=#{mblockid}
             group by pct.teacherid
+            )t left join t_user u on t.teacherid=u.userid
         </if>
     </select>
     <!--阅卷进度-按教师-->
@@ -337,7 +338,7 @@
         <if test="param.correcttype==1">
             select pb.mptqid as mblockid,pb.qorder,pb.qn,pb.qscore
             from ms_paper_qtype_question pb
-            where pb.mpid=#{param.mpid} and pb.ctype in(3,13,14,15)
+            where pb.mpid=#{param.mpid} and pb.qtype=2
             group by pb.mptqid
             order by pb.qorder,pb.qn
         </if>
@@ -415,11 +416,11 @@
     <select id="listByQuestion" resultMap="questionResultMap">
         select q.qorder,q.qn,q.qscore,q.mptqid as mblockid,q.mpid,pc.checktype,pc.checkstate
         ,count(distinct psq.mpsqid) as totalNum
-        ,count(if(psq.firstcime is not null or psq.secondctime is not null,psq.mpsqid,null)) as checkedNum
-        ,count(if(psq.firstcime is null or (pc.checktype=2 and psq.secondctime is null),psq.mpsqid,null)) as uncheckedNum
-        from ms_paper_qtype_question q left join ms_paper_check pc on q.mpid=pc.mpid
+        ,count(distinct if(psq.checked=3,psq.mpsqid,null)) as checkedNum
+        ,count(distinct if(psq.checked!=3,psq.mpsqid,null)) as uncheckedNum
+        from ms_paper_qtype_question q left join ms_paper_check pc on q.mpid=pc.mpid and pc.mblockid=q.mptqid
         left join ms_paper_student_question psq on q.mptqid=psq.mptqid and psq.answered=1
-        where q.mpid=#{mpid} and q.ctype in(3,13,14,15)
+        where q.mpid=#{mpid} and q.qtype=2
         group by q.mptqid
         order by q.qorder,q.qn
     </select>
@@ -434,22 +435,25 @@
             group by pctt.teacherid
         </if>
         <if test="dispenseway!=null and dispenseway==2">
-            select t.teacherid,u.username as teachername
-            ,sum(t.totalNum) as totalNum,sum(t.checkedNum) as checkedNum,sum(t.uncheckedNum) as uncheckedNum
-            from(select psb.firstcid as teacherid,count(*) as totalNum,count(if(psb.firstcime is not null,1,null)) as checkedNum
-            ,count(if(psb.firstcime is null,1,null)) as uncheckedNum
-            from ms_paper_student_question psb
-            where psb.mpid=#{mpid} and psb.mptqid=#{mblockid}
-            group by psb.firstcid
-            <if test="checktype!=null and checktype==2">
-                union
-                select psb.secondcid as teacherid,count(*) as totalNum,count(if(psb.secondctime is not null,1,null)) as checkedNum
-                ,count(if(psb.secondctime is null,1,null)) as uncheckedNum
-                from ms_paper_student_question psb
-                where psb.mpid=#{mpid} and psb.mptqid=#{mblockid}
-                group by psb.secondcid
-            </if>)t left join t_user u on t.teacherid=u.userid
-            group by t.teacherid
+            select t.*,u.username as teachername
+            from(select pct.teacherid,count(distinct psb.mpsqid) as totalNum
+            ,count(distinct if(((psb.firstcid=pct.teacherid and psb.firstcime is not null)
+            <if test="checktype==2">
+                or (psb.secondcid=pct.teacherid and psb.secondctime is not null)
+            </if>
+            )
+            ,psb.mpsqid,null)) as checkedNum
+            ,count(distinct if(psb.checked=1 or (psb.checked=2 and ((psb.firstcid=pct.teacherid and psb.firstcime is null)
+            <if test="checktype==2">
+                or (psb.secondcid=pct.teacherid and psb.secondctime is null)
+                or (psb.firstcid!=pct.teacherid and psb.secondcid is null)
+                or (psb.secondcid!=pct.teacherid and psb.firstcid is null)
+            </if>
+            )),psb.mpsqid,null)) as uncheckedNum
+            from ms_paper_check_teacher pct left join ms_paper_student_question psb on pct.mpid=psb.mpid and pct.mblockid=psb.mptqid and psb.answered=1
+            where pct.mpid=#{mpid} and pct.mblockid=#{mblockid}
+            group by pct.teacherid
+            )t left join t_user u on t.teacherid=u.userid
         </if>
     </select>
     <!--阅卷进度-按班级-->
@@ -467,10 +471,10 @@
     <select id="listByClass" resultMap="classResultMap">
         select c.classname,c.classid as mblockid,pc.mpid,pc.checktype,pc.checkstate
         ,count(distinct psq.mpsqid) as totalNum
-        ,count(if(psq.firstcime is not null or psq.secondctime is not null,psq.mpsqid,null)) as checkedNum
-        ,count(if(psq.firstcime is null or (pc.checktype=2 and psq.secondctime is null),psq.mpsqid,null)) as uncheckedNum
+        ,count(distinct if(psq.checked=3,psq.mpsqid,null)) as checkedNum
+        ,count(distinct if(psq.checked!=3,psq.mpsqid,null)) as uncheckedNum
         from ms_class c inner join ms_paper_check pc on pc.mblockid=c.classid
-        left join ms_class_student cs on c.examid=cs.examid and c.subjectid=cs.subjectid and pc.mblockid=cs.classid
+        inner join ms_class_student cs on c.examid=cs.examid and c.subjectid=cs.subjectid and pc.mblockid=cs.classid
         left join ms_paper_student_question psq on pc.mpid=psq.mpid and psq.studentid=cs.studentid and psq.answered=1 and psq.ctype in(3,13,14,15)
         where pc.mpid=#{mpid} and c.subjectid=#{subjectid}
         group by c.classid
@@ -478,16 +482,15 @@
     </select>
     <!--阅卷进度-按班级-查看详情-->
     <select id="detailByClass" resultType="java.util.Map">
-        select t.teacherid,u.username as teachername
-        ,sum(t.totalNum) as totalNum,sum(t.checkedNum) as checkedNum
-        from(select pct.teacherid,count(psb.mpsqid) as totalNum,count(if(psb.firstcime is not null,1,null)) as checkedNum
-        from ms_paper_check_teacher pct left join ms_paper_student_question psb on psb.mpid=pct.mpid and psb.ctype in(3,13,14,15) and psb.firstcid=pct.teacherid
-        left join ms_class_student cs on psb.examid=cs.examid and psb.subjectid=cs.subjectid and psb.studentid=cs.studentid
+        select t.*,u.username as teachername
+        from(select pct.teacherid,count(distinct if(psb.answered=1,psb.mpsqid,null)) as totalNum
+        ,count(distinct if(psb.checked=3 and psb.firstcid=pct.teacherid,psb.mpsqid,null)) as checkedNum
+        from ms_paper_check_teacher pct left join ms_paper_student_question psb on psb.mpid=pct.mpid and psb.ctype in(3,13,14,15)
+        inner join ms_class_student cs on psb.examid=cs.examid and psb.subjectid=cs.subjectid and psb.studentid=cs.studentid
         and cs.classid=pct.mblockid
         where pct.mpid=#{mpid} and pct.mblockid=#{mblockid}
         group by pct.teacherid
         )t left join t_user u on t.teacherid=u.userid
-        group by t.teacherid
     </select>
     <!--教师阅卷-待批试题列表-->
     <select id="listQuestionCheck" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheck">
@@ -703,14 +706,14 @@
     </select>
     <!--获取批阅结果-->
     <select id="getCheckResult" resultType="com.xhkjedu.smarking.vo.papercheck.MsCheckVo">
-        select psq.firstcid,psq.firstcime,psq.firstccore,psq.firstccores,psq.secondcid,psq.secondctime,psq.secondcscore,psq.secondcscores
+        select psq.firstcid,psq.firstcime,psq.firstccore,psq.secondcid,psq.secondctime,psq.secondcscore
         ,psq.mpsid
         <if test="param.correcttype==3">
             from ms_paper_student_block psq
             where psq.mpsbid=#{param.mpsbid}
         </if>
         <if test="param.correcttype!=3">
-            from ms_paper_student_block psq
+            from ms_paper_student_question psq
             where psq.mpsqid=#{param.mpsbid}
         </if>
     </select>