教师阅卷

smarking/src/main/java/com/xhkjedu/smarking/controller/papercheck/MsPaperCheckTeacherTaskController.java

@@ -146,4 +146,20 @@ public class MsPaperCheckTeacherTaskController {
         List<Map> list = msPaperCheckTeacherTaskService.listByQuestion(mpid);
         return new ResultVo(0, "查询成功", list);
     }
+
+    /**
+     * @Description 阅卷进度-按试题-查看详情
+     * @Date 2024/11/11 9:24
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/detail_by_question")
+    public ResultVo detailByQuestion(@RequestBody MsCheckParam param) {
+        Integer mpid = param.getMpid();
+        Integer mblockid = param.getMblockid();
+        N_Utils.validation(new Object[]{mpid, "试卷ID", 1, mblockid, "试题ID", 1});
+        List<Map> list = msPaperCheckTeacherTaskService.detailByQuestion(mpid, mblockid);
+        return new ResultVo(0, "查询成功", list);
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/paper/MsPaperMapper.java

@@ -61,4 +61,7 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
 
     //获取试卷对应科目状态
     PExamSubjectVo getSubjectStateByMpid(@Param("mpid") Integer mpid);
+
+    //获取试卷批阅设置
+    Integer getCorrectTypeByMpId(@Param("mpid") Integer mpid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/papercheck/MsPaperCheckTeacherTaskMapper.java

@@ -1,8 +1,7 @@
 package com.xhkjedu.smarking.mapper.papercheck;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.smarking.model.papercheck.MsPaperCheck;
-import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacherTask;
+import com.xhkjedu.smarking.model.papercheck.*;
 import com.xhkjedu.smarking.vo.papercheck.MsCheckParam;
 import com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo;
 import org.apache.ibatis.annotations.Param;
@@ -34,7 +33,7 @@ public interface MsPaperCheckTeacherTaskMapper extends TkMapper<MsPaperCheckTeac
             , @Param("dispenseway") Integer dispenseway,@Param("checktype") Integer checktype);
 
     //阅卷进度-按教师
-    List<Map> listByTeacher(@Param("mpid") Integer mpid);
+    List<Map> listByTeacher(@Param("mpid") Integer mpid, @Param("correcttype") Integer correcttype);
 
     //教师阅卷-待阅卷列表
     List<Map> listPending(@Param("param") MsCheckParam param);
@@ -45,17 +44,38 @@ public interface MsPaperCheckTeacherTaskMapper extends TkMapper<MsPaperCheckTeac
     //教师阅卷-题块列表
     List<Map> listTeacherBlock(@Param("param") MsCheckParam param);
 
-    //获取题块阅卷信息
-    List<MsPaperCheck> listPaperCheck(@Param("param") MsCheckParam param);
+    //教师阅卷-待批题块列表
+    List<MsPaperCheck> listBlockCheck(@Param("param") MsCheckParam param);
 
-    //获取待批试题（平均、定量分配）
-    MsPaperCheckVo getCorrectBlock(@Param("param") MsCheckParam param);
-    //获取待批试题（效率优先）
-    MsPaperCheckVo getCorrectBlock2(@Param("param") MsCheckParam param);
+    //教师阅卷-按题块-获取待批试题
+    MsPaperCheckVo getCorrectBlock(@Param("param") MsPaperCheck param);
 
     //删除教师阅卷任务
     void deleteByMpsbids(@Param("mpsbids") String mpsbids);
 
     //阅卷进度-按试题
     List<Map> listByQuestion(@Param("mpid") Integer mpid,@Param("correcttype") Integer correcttype);
+
+    //阅卷进度-按试题-查看详情
+    List<Map> detailByQuestion(@Param("mpid") Integer mpid,@Param("mblockid") Integer mblockid
+            ,@Param("dispenseway") Integer dispenseway,@Param("checktype") Integer checktype);
+
+    //教师阅卷-待批试题列表
+    List<MsPaperCheck> listQuestionCheck(@Param("param") MsCheckParam param);
+
+    //教师阅卷-按试题-获取待批试题
+    MsPaperCheckVo getCorrectQuestion(@Param("param") MsPaperCheck param);
+
+    //教师阅卷-待批班级列表
+    List<MsPaperCheck> listClassCheck(@Param("param") MsCheckParam param);
+
+    //教师阅卷-按班级-获取待批试题
+    MsPaperCheckVo getCorrectClassQuestion(@Param("param") MsPaperCheck check);
+
+    //更新教师阅卷任务状态
+    void updateCheckStatus(@Param("mpid") Integer mpid, @Param("mpsbid") Integer mpsbid
+            , @Param("teacherid") Integer teacherid, @Param("checkstate") int checkstate);
+
+    //获取教师批阅数量
+    MsPaperCheckTeacher getCheckNum(@Param("param") MsPaperCheck paperCheck);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/papercheck/MsPaperCheck.java

@@ -57,5 +57,8 @@ public class MsPaperCheck extends BaseBean {
     @Transient
     //题块/试题/班级IDS
     private List<Integer> mblockids;
+    @Transient
+    //考试试题表id
+    private Integer mptqid;
 
 }

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

@@ -4,9 +4,13 @@ import com.xhkjedu.exception.ServiceException;
 import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckMapper;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherTaskMapper;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
 import com.xhkjedu.smarking.mapper.system.UserMapper;
-import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.papercheck.MsPaperCheck;
+import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.vo.papercheck.MsCheckParam;
 import com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo;
 import com.xhkjedu.utils.N_Utils;
@@ -32,6 +36,11 @@ public class MsPaperCheckTeacherTaskService {
     private MsPaperCheckMapper msPaperCheckMapper;
     @Resource
     private MsPaperMapper msPaperMapper;
+    @Resource
+    private MsPaperStudentBlockMapper msPaperStudentBlockMapper;
+    @Resource
+    private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
+
 
     /**
      * @Description 阅卷进度-按题块
@@ -58,6 +67,11 @@ public class MsPaperCheckTeacherTaskService {
         }
         Integer dispenseway = check.getDispenseway();
         List<Map> list = msPaperCheckTeacherTaskMapper.detailByBlock(mpid, mblockid, dispenseway, check.getChecktype());
+        return setListNum(dispenseway, list);
+    }
+
+    //计算题块/试题的总数和未批阅的数量
+    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 totalCheckedNum = list.stream().mapToInt(m -> N_Utils.obj2Int(m.get("checkedNum"))).sum();
@@ -78,7 +92,11 @@ public class MsPaperCheckTeacherTaskService {
      * @Return java.util.List<java.util.Map>
      **/
     public List<Map> listByTeacher(Integer mpid) {
-        return msPaperCheckTeacherTaskMapper.listByTeacher(mpid);
+        Integer correcttype = msPaperMapper.getCorrectTypeByMpId(mpid);
+        if (!N_Utils.isTrueInteger(correcttype)) {
+            throw new ServiceException("该试卷未设置批阅方式");
+        }
+        return msPaperCheckTeacherTaskMapper.listByTeacher(mpid, correcttype);
     }
 
     /**
@@ -131,27 +149,101 @@ public class MsPaperCheckTeacherTaskService {
      * @Return java.util.Map
      **/
     public ResultVo getCorrectBlock(MsCheckParam param) {
-        setParam(param);
-
-        List<MsPaperCheck> checks = msPaperCheckTeacherTaskMapper.listPaperCheck(param);
-        if (N_Utils.isListEmpty(checks)) throw new ServiceException("暂无要批阅的题块");
+        Integer correcttype = msPaperMapper.getCorrectTypeByMpId(param.getMpid());
+        if (!N_Utils.isTrueInteger(correcttype)) {
+            throw new ServiceException("该试卷未设置批阅方式");
+        }
         MsPaperCheckVo sq = null;
-        for (MsPaperCheck check : checks) {
-            Integer checktype = check.getChecktype();
-            param.setChecktype(checktype);
-            Integer dispenseway = check.getDispenseway();
-            if (dispenseway.equals(2)) {//效率优先
-                param.setChecktype(check.getChecktype());
-                sq = msPaperCheckTeacherTaskMapper.getCorrectBlock2(param);
-            } else {
-                sq = msPaperCheckTeacherTaskMapper.getCorrectBlock(param);
+        Integer dispenseway = null;
+        Integer type = null;//评卷方式1单评2双评
+        Integer handleid = param.getHandleid();
+        MsPaperCheck paperCheck = null;
+        if (correcttype.equals(3)) {//按题块批阅
+            List<MsPaperCheck> checks = msPaperCheckTeacherTaskMapper.listBlockCheck(param);
+            if (N_Utils.isListEmpty(checks)) throw new ServiceException("暂无要批阅的题块");
+            for (MsPaperCheck check : checks) {
+                check.setTeacherid(handleid);
+                sq = msPaperCheckTeacherTaskMapper.getCorrectBlock(check);
+                if (sq != null) {
+                    paperCheck = check;
+                    break;
+                }
+            }
+        } else if (correcttype.equals(2)) {//按试题批阅
+            List<MsPaperCheck> checks = msPaperCheckTeacherTaskMapper.listQuestionCheck(param);
+            if (N_Utils.isListEmpty(checks)) throw new ServiceException("暂无要批阅的试题");
+            for (MsPaperCheck check : checks) {
+                check.setTeacherid(handleid);
+                sq = msPaperCheckTeacherTaskMapper.getCorrectQuestion(check);
+                if (sq != null) {
+                    paperCheck = check;
+                    break;
+                }
             }
-            if (sq != null) {
-                break;
+        } else {//按班级批阅
+            List<MsPaperCheck> checks = msPaperCheckTeacherTaskMapper.listClassCheck(param);
+            if (N_Utils.isListEmpty(checks)) throw new ServiceException("暂无要批阅的班级");
+            for (MsPaperCheck check : checks) {
+                check.setTeacherid(handleid);
+                sq = msPaperCheckTeacherTaskMapper.getCorrectClassQuestion(check);
+                if (sq != null) {
+                    paperCheck = check;
+                    break;
+                }
+            }
+        }
+
+        if (paperCheck != null) {
+            dispenseway = paperCheck.getDispenseway();
+            type = paperCheck.getChecktype();
+        }
+        Integer totalNum = 0;
+        Integer checkedNum = 0;
+        if (sq != null) {
+            MsPaperCheckTeacher teacher = msPaperCheckTeacherTaskMapper.getCheckNum(paperCheck);
+            totalNum = teacher.getTasknum();
+            checkedNum = teacher.getCheckednum();
+            if (!dispenseway.equals(2)) {
+                //更新教师阅卷任务状态
+                msPaperCheckTeacherTaskMapper.updateCheckStatus(sq.getMpid(), sq.getMpsbid(), handleid, 2);
+            }
+            Integer checktype = sq.getChecktype();
+            Integer firstcid = sq.getFirstcid();
+            if (!N_Utils.isTrueInteger(checktype)) {
+                if (type.equals(1)) {
+                    checktype = 1;
+                } else if (N_Utils.isTrueInteger(firstcid) && !handleid.equals(firstcid)) {
+                    checktype = 2;
+                } else {
+                    checktype = 1;
+                }
+            }
+            if (correcttype.equals(3)) {//按题块批阅
+                MsPaperStudentBlock block = new MsPaperStudentBlock();
+                block.setMpsbid(sq.getMpsbid());
+                if (checktype.equals(1)) {
+                    block.setFirstcid(handleid);
+                } else {
+                    block.setSecondcid(handleid);
+                }
+                block.setChecked(1);
+                msPaperStudentBlockMapper.updateByPrimaryKeySelective(block);
+            } else {//按试题/班级批阅
+                MsPaperStudentQuestion question = new MsPaperStudentQuestion();
+                question.setMpsqid(sq.getMpsbid());
+                question.setChecked(1);
+                if (checktype.equals(1)) {
+                    question.setFirstcid(handleid);
+                } else {
+                    question.setSecondcid(handleid);
+                }
+                msPaperStudentQuestionMapper.updateByPrimaryKeySelective(question);
             }
         }
         Map map = new HashMap();
         map.put("sq", sq);
+        map.put("totalNum", totalNum);
+        map.put("checkedNum", checkedNum);
         String msg = "获取成功";
         return new ResultVo(0, msg, map);
     }
@@ -164,14 +256,27 @@ public class MsPaperCheckTeacherTaskService {
      * @Return java.util.List<java.util.Map>
      **/
     public List<Map> listByQuestion(Integer mpid) {
-        MsPaper paper = msPaperMapper.selectByPrimaryKey(mpid);
-        if (paper == null) {
-            throw new ServiceException("该试卷不存在");
-        }
-        Integer correcttype = paper.getCorrecttype();
+        Integer correcttype = msPaperMapper.getCorrectTypeByMpId(mpid);
         if (!N_Utils.isTrueInteger(correcttype)) {
             throw new ServiceException("该试卷未设置批阅方式");
         }
         return msPaperCheckTeacherTaskMapper.listByQuestion(mpid, correcttype);
     }
+
+    /**
+     * @Description 阅卷进度-按试题-查看详情
+     * @Date 2024/11/11 9:24
+     * @Author YWX
+     * @Param [mpid, mblockid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> detailByQuestion(Integer mpid, Integer mblockid) {
+        MsPaperCheck check = msPaperCheckMapper.findByMBlockId(mpid, mblockid);
+        if (check == null) {
+            throw new ServiceException("该试题不存在");
+        }
+        Integer dispenseway = check.getDispenseway();
+        List<Map> list = msPaperCheckTeacherTaskMapper.detailByQuestion(mpid, mblockid, dispenseway, check.getChecktype());
+        return setListNum(dispenseway, list);
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/papercheck/MsCheckParam.java

@@ -30,4 +30,6 @@ public class MsCheckParam extends BaseBean {
     private Integer usertype;
     //分配方式1平均分配2效率优先3定量分配
     private Integer dispenseway;
+    //考试试题表id
+    private Integer mptqid;
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/papercheck/MsPaperCheckVo.java

@@ -9,6 +9,8 @@ import lombok.Data;
  **/
 @Data
 public class MsPaperCheckVo {
+    //试卷ID
+    private Integer mpid;
     //题块ID
     private Integer mblockid;
     //阅卷试卷学生题块ID
@@ -39,4 +41,6 @@ public class MsPaperCheckVo {
     private Integer arbitratetime;
     //仲裁分值
     private Double arbitratescore;
+    //批阅情况1一评2二评
+    private Integer checktype;
 }

smarking/src/main/resources/mapper/paper/MsPaperMapper.xml

@@ -108,4 +108,8 @@
     <select id="getSubjectStateByMpid" resultType="com.xhkjedu.smarking.vo.paper.PExamSubjectVo">
         select s.msid,s.msstate from ms_subject s left join ms_paper p on s.msid=p.msid where p.mpid=#{mpid}
     </select>
+    <!--获取试卷批阅设置-->
+    <select id="getCorrectTypeByMpId" resultType="java.lang.Integer">
+        select correcttype from ms_paper where mpid=#{mpid}
+    </select>
 </mapper>

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

@@ -29,6 +29,12 @@
             #{item.mpcttid}
         </foreach>
     </update>
+    <!--更新教师阅卷任务状态-->
+    <update id="updateCheckStatus">
+        update ms_paper_check_teacher_task
+        set checkstate = #{checkstate}
+        where mpid=#{mpid} and mpsbid=#{mpsbid} and teacherid=#{teacherid}
+    </update>
     <!--删除教师阅卷任务-->
     <delete id="deleteByMpsbids">
         delete from ms_paper_check_teacher_task where mpsbid in (${mpsbids})
@@ -101,30 +107,65 @@
     <!--阅卷进度-按教师-->
     <resultMap id="teacherResultMap" type="java.util.Map">
         <id property="teacherid" column="teacherid"/>
-        <id property="teachername" column="teachername"/>
-        <collection property="blocks" ofType="java.util.Map">
+        <result property="teachername" column="teachername"/>
+        <collection property="blocks" ofType="java.util.Map" javaType="java.util.List">
             <id property="mblockid" column="mblockid"/>
-            <id property="blockname" column="blockname"/>
-            <id property="totalNum" column="total_num"/>
-            <id property="checkedNum" column="checked_num"/>
-            <id property="uncheckedNum" column="uncheck_num"/>
+            <result property="qorder" column="qorder"/>
+            <result property="qn" column="qn"/>
+            <result property="blockname" column="blockname"/>
+            <result property="totalNum" column="total_num"/>
+            <result property="checkedNum" column="checked_num"/>
+            <result property="uncheckedNum" column="uncheck_num"/>
         </collection>
     </resultMap>
     <select id="listByTeacher" resultMap="teacherResultMap">
-        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 total_num
-        ,count(if((psb.firstcid=pct.teacherid and psb.firstcime>0) or (psb.secondcid=pct.teacherid and psb.secondctime>0),psb.mpsbid,null)) as checked_num
-        ,count(if((psb.firstcid=pct.teacherid and psb.firstcime=0) or (psb.secondcid=pct.teacherid and psb.secondctime=0),psb.mpsbid,null)) as uncheck_num
-        ,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
-        left join ms_paper_check pc on pct.mblockid = pc.mblockid
-        left join ms_paper_student_block psb on psb.mblockid = pct.mblockid
-        where pct.mpid=#{mpid}
-        group by pct.teacherid,pct.mblockid
-        order by teachername,pb.blockorder
+        <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 total_num
+            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime>0) or (psb.secondcid=pct.teacherid and psb.secondctime>0),psb.mpsqid,null)) as checked_num
+            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime=0) or (psb.secondcid=pct.teacherid and psb.secondctime=0),psb.mpsqid,null)) as uncheck_num
+            ,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)
+            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 total_num
+            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime>0) or (psb.secondcid=pct.teacherid and psb.secondctime>0),psb.mpsqid,null)) as checked_num
+            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime=0) or (psb.secondcid=pct.teacherid and psb.secondctime=0),psb.mpsqid,null)) as uncheck_num
+            ,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
+            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 total_num
+            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime>0) or (psb.secondcid=pct.teacherid and psb.secondctime>0),psb.mpsbid,null)) as checked_num
+            ,count(if((psb.firstcid=pct.teacherid and psb.firstcime=0) or (psb.secondcid=pct.teacherid and psb.secondctime=0),psb.mpsbid,null)) as uncheck_num
+            ,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
+            where pct.mpid=#{mpid}
+            group by pct.teacherid,pct.mblockid
+            order by teachername,pb.blockorder
+        </if>
     </select>
     <!--教师阅卷-待批阅列表-->
     <select id="listPending" resultType="java.util.Map">
@@ -138,7 +179,7 @@
         from ms_subject s inner join ms_exam e on s.examid = e.examid
         inner join ms_paper_check pc on pc.msid = s.msid
         <if test="param.usertype==1 and param.handleid!=null">
-            inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid
+            inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid
         </if>
         inner join ms_paper_student_block psb on psb.mblockid = pc.mblockid
         where e.schoolid=#{param.schoolid} and s.checkstate=1 and e.deleted=1
@@ -161,10 +202,10 @@
         ,count(if((psb.firstcime=0 and psb.firstcid=#{param.handleid})
         or (psb.secondctime=0 and psb.secondcid=#{param.handleid}) or pc.dispenseway=2
         ,psb.mpsbid,null)) as my_unchecked_num
-        from ms_paper_check pc left join ms_paper_student_block psb on psb.mblockid = pc.mblockid
-        inner join ms_paper_block pb on pc.mblockid = pb.mblockid
+        from ms_paper_check pc left join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid
+        inner join ms_paper_block pb on pc.mblockid = pb.mblockid and pb.mpid = pc.mpid
         <if test="param.usertype==1 and param.handleid!=null">
-            inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.teacherid = #{param.handleid}
+            inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid and pct.teacherid = #{param.handleid}
             and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or pc.dispenseway=2)
         </if>
         where pc.mpid=#{param.mpid}
@@ -180,40 +221,39 @@
         group by pb.mblockid
         order by pb.blockorder
     </select>
-    <!--获取题块阅卷状态-->
-    <select id="listPaperCheck" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheck">
+    <!--教师阅卷-待批题块列表-->
+    <select id="listBlockCheck" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheck">
         select pc.mblockid,pc.checktype,pc.hidefirstscore,pc.scoreway,pc.finalscore,pc.roundvalue,pc.dispenseway,pc.numtype
-        ,pc.checkstate
-        from ms_paper_check pc inner join ms_paper_student_block psb on psb.mblockid = pc.mblockid
-        inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.teacherid = #{param.handleid}
-        where pc.checkstate=1 and psb.checked!=2 and pc.mblockid in
-        <foreach collection="param.mblockids" item="mblockid" open="(" separator="," close=")">
-            #{mblockid}
-        </foreach>
+        ,pc.checkstate,pc.correcttype,pc.mpid
+        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!=2 and pc.mpid=#{param.mpid}
+        group by pc.mblockid
         order by pc.mpcid
     </select>
-    <!--获取待批试题（平均、定量分配）-->
+    <!--教师阅卷-按题块-获取待批试题-->
     <select id="getCorrectBlock" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
-        select pctt.mblockid,psb.mpsbid,psb.stuanswer,psb.checked
-        ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
-        from ms_paper_student_block psb inner join ms_paper_check_teacher_task pctt on psb.mpsbid = pctt.mpsbid
-        where pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.handleid}
-        order by field(pctt.checkstate,2,1,3),pctt.taskorder
-        limit 1
-    </select>
-    <!--获取待批试题（效率优先）-->
-    <select id="getCorrectBlock2" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
-        select pctt.mblockid,psb.mpsbid,psb.answertype,psb.stuanswer,psb.qscore,psb.checked
-        ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
-        from ms_paper_student_block psb
-        where psb.mblockid = #{param.mblockid}
-        and (psb.checked=0 or psb.firstcid=#{param.handleid}
-        <if test="param.checktype==2">
-            or psb.secondcid=#{param.handleid}
-        </if>
-        )
-        order by field(psb.checked,2,1,3),pctt.taskorder
-        limit 1
+        <if test="param.dispenseway!=null and param.dispenseway!=2">
+            select pctt.mblockid,pctt.mpsbid,pctt.checktype,psb.stuanswer,psb.checked
+            ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
+            from ms_paper_student_block psb inner join ms_paper_check_teacher_task pctt on psb.mpsbid = pctt.mpsbid and psb.mpid=pctt.mpid
+            where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
+            order by field(pctt.checkstate,2,1,3),pctt.taskorder
+            limit 1
+        </if>
+        <if test="param.dispenseway!=null and param.dispenseway==2">
+            select psb.mblockid,psb.mpsbid,psb.answertype,psb.stuanswer,psb.qscore,psb.checked
+            ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
+            from ms_paper_student_block psb
+            where psb.mpid=#{param.mpid} and psb.mblockid = #{param.mblockid}
+            and (psb.checked=0 or (psb.checked=1 and (psb.firstcid=#{param.teacherid}
+            <if test="param.checktype==2">
+                or psb.secondcid=#{param.teacherid}
+            </if>
+            )))
+            order by field(psb.checked,1,0,2)
+            limit 1
+        </if>
     </select>
     <!--阅卷进度-按试题-->
     <resultMap id="questionResultMap" type="java.util.Map">
@@ -239,4 +279,130 @@
         group by q.mptqid
         order by q.qorder,q.qn
     </select>
+    <!--阅卷进度-按试题-查看详情-->
+    <select id="detailByQuestion" resultType="java.util.Map">
+        <if test="dispenseway!=null and dispenseway!=2">
+            select pctt.teacherid,u.username as teachername
+            ,count(pctt.mpcttid) as total_num,count(if(pctt.checkstate=3,1,null)) as checked_num
+            ,count(if(pctt.checkstate!=3,1,null))as uncheck_num
+            from ms_paper_check_teacher_task pctt left join t_user u on u.userid = pctt.teacherid
+            where pctt.mpid=#{mpid} and pctt.mblockid=#{mblockid}
+            group by pctt.teacherid
+        </if>
+        <if test="dispenseway!=null and dispenseway==2">
+            select t.teacherid,u.username as teachername
+            ,sum(t.total_num) as total_num,sum(t.checked_num) as checked_num,sum(t.uncheck_num) as uncheck_num
+            from(select psb.firstcid as teacherid,count(*) as total_num,count(if(psb.firstcime is not null,1,null)) as checked_num
+            ,count(if(psb.firstcime is null,1,null)) as uncheck_num
+            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 total_num,count(if(psb.secondctime is not null,1,null)) as checked_num
+                ,count(if(psb.secondctime is null,1,null)) as uncheck_num
+                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
+        </if>
+    </select>
+    <!--教师阅卷-待批试题列表-->
+    <select id="listQuestionCheck" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheck">
+        select pc.mblockid,pc.checktype,pc.hidefirstscore,pc.scoreway,pc.finalscore,pc.roundvalue,pc.dispenseway,pc.numtype
+        ,pc.checkstate,pc.correcttype,pc.mpid
+        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!=2 and pc.mpid=#{param.mpid}
+        group by pc.mblockid
+        order by pc.mpcid
+    </select>
+    <!--教师阅卷-按试题-获取待批试题-->
+    <select id="getCorrectQuestion" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
+        <if test="param.dispenseway!=null and param.dispenseway!=2">
+            select pctt.mblockid,pctt.mpsbid,pctt.checktype,psb.stuanswer,psb.checked
+            ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
+            from ms_paper_student_question psb inner join ms_paper_check_teacher_task pctt on psb.mpsqid = pctt.mpsbid and psb.mpid=pctt.mpid
+            where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
+            order by field(pctt.checkstate,2,1,3),pctt.taskorder
+            limit 1
+        </if>
+        <if test="param.dispenseway!=null and param.dispenseway==2">
+            select psb.mptqid as mblockid,psb.mpsqid as mpsbid,psb.answertype,psb.stuanswer,psb.qscore,psb.checked
+            ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
+            from ms_paper_student_question psb
+            where psb.mpid=#{param.mpid} and psb.mptqid = #{param.mblockid}
+            and (psb.checked=0 or (psb.checked=1 and (psb.firstcid=#{param.teacherid}
+            <if test="param.checktype==2">
+                or psb.secondcid=#{param.teacherid}
+            </if>
+            )))
+            order by field(psb.checked,1,0,2)
+            limit 1
+        </if>
+    </select>
+    <!--教师阅卷-待批班级列表-->
+    <select id="listClassCheck" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheck">
+        select pc.mblockid,pc.checktype,pc.hidefirstscore,pc.scoreway,pc.finalscore,pc.roundvalue,pc.dispenseway,pc.numtype
+        ,pc.checkstate,pc.correcttype,pc.mpid
+        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!=2 and pc.mpid=#{param.mpid}
+        group by pc.mblockid
+        order by pc.mpcid
+    </select>
+    <!--教师阅卷-按班级-获取待批试题-->
+    <select id="getCorrectClassQuestion" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
+        <if test="param.dispenseway!=null and param.dispenseway!=2">
+            select pctt.mblockid,pctt.mpsbid,pctt.checktype,psb.stuanswer,psb.checked
+            ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime,psb.mptqid
+            from ms_paper_student_question psb inner join ms_paper_check_teacher_task pctt on psb.mpsqid = pctt.mpsbid and psb.mpid=pctt.mpid
+            where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
+            order by field(pctt.checkstate,2,1,3),pctt.taskorder
+            limit 1
+        </if>
+        <if test="param.dispenseway!=null and param.dispenseway==2">
+            select c.classid as mblockid,psb.mpsqid as mpsbid,psb.answertype,psb.stuanswer,psb.qscore,psb.checked
+            ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime,psb.mptqid
+            from ms_paper_student_question psb inner join ms_class c on psb.mpid=c.mpid
+            where psb.mpid=#{param.mpid} and c.classid = #{param.mblockid}
+            and (psb.checked=0 or (psb.checked=1 and (psb.firstcid=#{param.teacherid}
+            <if test="param.checktype==2">
+                or psb.secondcid=#{param.teacherid}
+            </if>
+            )))
+            order by field(psb.checked,1,0,2),psb.mptqid
+            limit 1
+        </if>
+    </select>
+    <!--获取教师批阅数量-->
+    <select id="getCheckNum" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher">
+        <if test="param.dispenseway!=null and param.dispenseway!=2">
+            select pct.tasknum,count(if(pctt.checkstate=3,1,null)) as checkednum
+            from ms_paper_check_teacher pct left join ms_paper_check_teacher_task pctt on pct.mpid=pctt.mpid and pct.teacherid=pctt.teacherid pct.mblockid=pctt.mblockid
+            where pct.mpid=#{param.mpid} and pct.teacherid=#{param.handleid} and pct.mblockid=#{param.mblockid}
+        </if>
+        <if test="param.dispenseway!=null and param.dispenseway==2">
+            <if test="param.correcttype==3">
+                select count(psb.mpsbid*#{param.checktype}) as tasknum
+                ,count(if(pctt.checkstate=3,1,null)) as checkednum
+                from ms_paper_student_block psb left join ms_paper_check_teacher_task pctt on psb.mpid=pctt.mpid and pctt.teacherid=#{param.teacherid} and psb.mpsbid=pctt.mpsbid
+                where psb.mpid=#{param.mpid} and psb.mblockid=#{param.mblockid}
+            </if>
+            <if test="param.correcttype==2">
+                select count(psb.mpsqid*#{param.checktype}) as tasknum
+                ,count(if(pctt.checkstate=3,1,null)) as checkednum
+                from ms_paper_student_question psb left join ms_paper_check_teacher_task pctt on psb.mpid=pctt.mpid and pctt.teacherid=#{param.teacherid} and psb.mpsqid=pctt.mpsbid
+                where psb.mpid=#{param.mpid} and psb.mptqid=#{param.mblockid}
+            </if>
+            <if test="param.correcttype==1">
+                select count(psb.mpsqid*#{param.checktype}) as tasknum
+                ,count(if(pctt.checkstate=3,1,null)) as checkednum
+                from ms_paper_student_question psb left join ms_paper_check_teacher_task pctt on psb.mpid=pctt.mpid and pctt.teacherid=#{param.teacherid} and psb.mpsqid=pctt.mpsbid
+                inner join ms_class_student cs on psb.examid=cs.examid and psb.subjectid=cs.subjectid and psb.studentid=cs.studentid
+                where psb.mpid=#{param.mpid} and psb.mptqid=#{param.mptqid} and cs.classid=#{param.mblockid}
+            </if>
+        </if>
+    </select>
 </mapper>