批阅、仲裁

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

@@ -204,4 +204,36 @@ public class MsPaperCheckTeacherArbitrateController {
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
         return new ResultVo(0, "查询成功", pageResult);
     }
+
+    /**
+     * @Description 仲裁历史详情
+     * @Date 2024/11/20 9:14
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/detail_history")
+    public ResultVo detailHistory(@RequestBody MsCheckParam param) {
+        N_Utils.validation(new Object[]{
+                param.getMpctaid(), "任务ID", 1
+                , param.getMpid(), "批阅设置", 1
+        });
+        return new ResultVo(0, "查询成功", msPaperCheckTeacherArbitrateService.detailHistory(param));
+    }
+
+    /**
+     * @Description 初评分
+     * @Date 2024/11/20 9:31
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/get_score")
+    public ResultVo getScore(@RequestBody MsCheckParam param) {
+        N_Utils.validation(new Object[]{
+                param.getMpsbid(), "学生题块ID", 1
+                , param.getCorrecttype(), "批阅设置", 1
+        });
+        return new ResultVo(0, "查询成功", msPaperCheckTeacherArbitrateService.getScore(param));
+    }
 }

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

@@ -297,13 +297,13 @@ public class MsPaperCheckTeacherTaskController {
      * @Param [param]
      * @Return com.xhkjedu.vo.ResultVo
      **/
-    @PostMapping("/detail_correct")
-    public ResultVo detailCorrect(@RequestBody MsCheckParam param) {
+    @PostMapping("/detail_history")
+    public ResultVo detailHistory(@RequestBody MsCheckParam param) {
         N_Utils.validation(new Object[]{
                 param.getMpcttid(), "任务ID", 1
-                , param.getMpid(), "试卷ID", 1
+                , param.getCorrecttype(), "试卷ID", 1
         });
-        return new ResultVo(0, "查询成功", msPaperCheckTeacherTaskService.detailCorrect(param));
+        return new ResultVo(0, "查询成功", msPaperCheckTeacherTaskService.detailHistory(param));
     }
 
     /**

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

@@ -42,4 +42,10 @@ public interface MsPaperCheckTeacherArbitrateMapper extends TkMapper<MsPaperChec
 
     //仲裁历史
     List<Map> listArbitrateHistory(@Param("param") MsCheckParam param);
+
+    //仲裁历史详情
+    Map detailHistory(@Param("param") MsCheckParam param);
+
+    //初评分
+    List<Map> getScore(@Param("param") MsCheckParam param);
 }

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

@@ -25,6 +25,9 @@ public interface MsPaperCheckTeacherTaskMapper extends TkMapper<MsPaperCheckTeac
     //批量保存或更新
     void batchSave(@Param("tasks") List<MsPaperCheckTeacherTask> tasks);
 
+    //保存或更新单个任务
+    void save(@Param("s") MsPaperCheckTeacherTask task);
+
     //阅卷进度-按题块
     List<Map> listByBlock(@Param("mpid") Integer mpid);
 
@@ -102,7 +105,7 @@ public interface MsPaperCheckTeacherTaskMapper extends TkMapper<MsPaperCheckTeac
     List<Map> listCorrectHistory(@Param("param") MsCheckParam param);
 
     //教师阅卷-历史详情
-    Map detailCorrect(@Param("param") MsCheckParam param);
+    Map detailHistory(@Param("param") MsCheckParam param);
 
     //教师阅卷-平均分
     Map avgScore(@Param("param") MsCheckParam param);

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

@@ -311,4 +311,41 @@ public class MsPaperCheckTeacherArbitrateService {
     public List<Map> listArbitrateHistory(MsCheckParam param) {
         return msPaperCheckTeacherArbitrateMapper.listArbitrateHistory(param);
     }
+
+    /**
+     * @Description 仲裁历史详情
+     * @Date 2024/11/20 9:13
+     * @Author YWX
+     * @Param [param]
+     * @Return java.util.Map
+     **/
+    public Map detailHistory(MsCheckParam param) {
+        return msPaperCheckTeacherArbitrateMapper.detailHistory(param);
+    }
+
+    /**
+     * @Description 初评分
+     * @Date 2024/11/20 9:31
+     * @Author YWX
+     * @Param [param]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> getScore(MsCheckParam param) {
+        List<Map> score = msPaperCheckTeacherArbitrateMapper.getScore(param);
+        for (Map map : score) {
+            double diffscore1 = 0;
+            double diffscore2 = 0;
+            if (map.get("scoreway").equals(2)) {
+                Object qscore = map.get("qscore");
+                Object diffscore = map.get("diffscore");
+                double scoreDiff1 = MarkingUtil.scoreDiff(map.get("firstccore"), qscore);
+                double scoreDiff2 = MarkingUtil.scoreDiff(map.get("secondcscore"), qscore);
+                diffscore1 = MarkingUtil.sub(diffscore, scoreDiff1);
+                diffscore2 = MarkingUtil.sub(diffscore, scoreDiff2);
+            }
+            map.put("diffscore1", diffscore1);
+            map.put("diffscore2", diffscore2);
+        }
+        return score;
+    }
 }

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

@@ -228,6 +228,7 @@ public class MsPaperCheckTeacherTaskService {
         Integer totalNum = 0;
         Integer checkedNum = 0;
         if (sq != null) {
+            sq.setMpid(param.getMpid());
             MsPaperCheckTeacher teacher = msPaperCheckTeacherTaskMapper.getCheckNum(paperCheck);
             totalNum = teacher.getTasknum();
             checkedNum = teacher.getCheckednum();
@@ -259,7 +260,7 @@ public class MsPaperCheckTeacherTaskService {
                 task.setCheckstate(2);
                 task.setChecktype(checktype);
                 task.setCreatetime(N_Utils.getSecondTimestamp());
-                msPaperCheckTeacherTaskMapper.insertSelective(task);
+                msPaperCheckTeacherTaskMapper.save(task);
             }
             if (correcttype.equals(3)) {//按题块批阅
                 MsPaperStudentBlock block = new MsPaperStudentBlock();
@@ -274,7 +275,7 @@ public class MsPaperCheckTeacherTaskService {
             } else {//按试题/班级批阅
                 MsPaperStudentQuestion question = new MsPaperStudentQuestion();
                 question.setMpsqid(sq.getMpsbid());
-                question.setChecked(1);
+                question.setChecked(2);
                 if (checktype.equals(1)) {
                     question.setFirstcid(handleid);
                 } else {
@@ -677,10 +678,8 @@ public class MsPaperCheckTeacherTaskService {
      * @Param [param]
      * @Return java.util.Map
      **/
-    public Map detailCorrect(MsCheckParam param) {
-        Integer correcttype = msPaperMapper.getCorrectTypeByMpId(param.getMpid());
-        param.setCorrecttype(correcttype);
-        return msPaperCheckTeacherTaskMapper.detailCorrect(param);
+    public Map detailHistory(MsCheckParam param) {
+        return msPaperCheckTeacherTaskMapper.detailHistory(param);
     }
 
     /**

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

@@ -40,4 +40,6 @@ public class MsCheckParam extends BaseBean {
     private Integer mpcttid;
     //科目id
     private String subjectid;
+    //阅卷仲裁教师任务ID
+    private Integer mpctaid;
 }

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

@@ -30,7 +30,7 @@ public class MsPaperCheckVo {
     private String stuanswer;
     //试题分值
     private Double qscore;
-    //是否批改0未批改1批改中2已批改
+    //是否批阅0默认1待批阅2批阅中3已批阅
     private Integer checked;
     //单评批改人
     private Integer firstcid;

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

@@ -66,6 +66,7 @@
     <!--根据题块id获取阅卷信息-->
     <select id="findByMBlockId" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheck">
         select mpcid,mpid,mblockid,checktype,arbitrateid,diffscore,hidefirstscore,scoreway,finalscore,roundvalue,dispenseway
+        ,checkstate,correcttype
         from ms_paper_check where mpid = #{mpid} and mblockid = #{mblockid}
     </select>
     <!--获取学生作答及批阅信息（按题块）-->

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

@@ -161,4 +161,30 @@
         </if>
         order by pcta.mpsbid desc
     </select>
+    <!--仲裁历史详情-->
+    <select id="detailHistory" resultType="java.util.Map">
+        select psq.stuanswer,mpcta.checkscore,mpcta.hasproblem,mpcta.problemtype,mpcta.problemcomm
+        ,mpcta.mpid,mpcta.mblockid,mpcta.mpsbid,mpcta.mptqid,mpcta.taskorder
+        from ms_paper_check_teacher_arbitrate mpcta
+        <if test="param.correcttype==3">
+            inner join ms_paper_student_block psq on mpcta.mpsbid=psq.mpsbid
+        </if>
+        <if test="param.correcttype==2">
+            inner join ms_paper_student_question psq on mpcta.mpsbid=psq.mpsqid
+        </if>
+        where mpcta.mpctaid=#{param.mpctaid}
+    </select>
+    <!--初评分-->
+    <select id="getScore" resultType="java.util.Map">
+        select psq.firstccore,psq.secondcscore,psq.qscore,psq.qorder,psq.qn
+        ,pc.diffscore,pc.scoreway
+        from ms_paper_student_question psq inner join ms_paper_check pc on psq.mpid=pc.mpid
+        <if test="param.correcttype==3">
+            where psq.mpsbid=#{param.mpsbid} and psq.mblockid=pc.mblockid
+        </if>
+        <if test="param.correcttype==2">
+            where psq.mpsqid=#{param.mpsbid} and psq.mptqid=pc.mblockid
+        </if>
+        order by psq.mpsqid
+    </select>
 </mapper>

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

@@ -9,6 +9,12 @@
             on duplicate key update taskorder=#{s.taskorder},checktype=#{s.checktype}
         </foreach>
     </insert>
+    <!--保存或更新单个任务-->
+    <insert id="save">
+        insert into ms_paper_check_teacher_task (mpid, mblockid, teacherid, taskorder, mpsbid, checktype, createtime)
+        values (#{s.mpid},#{s.mblockid},#{s.teacherid},#{s.taskorder},#{s.mpsbid},#{s.checktype},#{s.createtime})
+        on duplicate key update taskorder=#{s.taskorder},checktype=#{s.checktype}
+    </insert>
     <!--批量更新任务信息-->
     <update id="batchUpdate">
         update ms_paper_check_teacher_task
@@ -69,6 +75,7 @@
         <result property="blockorder" column="blockorder"/>
         <result property="bqnum" column="bqnum"/>
         <result property="checktype" column="checktype"/>
+        <result property="checkstate" column="checkstate"/>
         <result property="totalNum" column="totalNum"/>
         <result property="checkedNum" column="checkedNum"/>
         <result property="uncheckedNum" column="uncheckedNum"/>
@@ -81,13 +88,14 @@
         where u.userid = mct.teacherid and mct.mblockid = #{mblockid}
     </select>
     <select id="listByBlock" resultMap="blockResultMap">
-        select pc.mblockid,pb.blockname,pb.bqscore,pb.blockorder,pb.bqnum
-        ,pc.checktype,count(pctt.mpcttid) as totalNum,count(if(pctt.checkstate=3,1,null)) as checkedNum
+        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
+        ,(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
-        left join ms_paper_block pb on pc.mblockid = pb.mblockid
-        where pc.mpid=#{mpid}
-        group by pc.mblockid
+        right join ms_paper_block pb on pc.mblockid = pb.mblockid
+        where pb.mpid=#{mpid} and pb.blocktype= 2
+        group by pb.mblockid
         order by pb.blockorder
     </select>
     <!--阅卷进度-按题块-查看详情-->
@@ -194,7 +202,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
         inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid
-        inner join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid
+        inner join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid and psb.checked!=0
         where e.schoolid=#{param.schoolid} and s.checkstate=1 and e.deleted=1 and pc.dispenseway=2 and pc.correcttype=3
         group by s.msid
         <if test="param.checktype==0">having 100>checkrate</if>
@@ -208,7 +216,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
         inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid
-        inner join ms_paper_student_question psb on psb.mptqid = pc.mblockid and psb.mpid = pc.mpid
+        inner join ms_paper_student_question psb on psb.mptqid = pc.mblockid and psb.mpid = pc.mpid and psb.checked!=0
         where e.schoolid=#{param.schoolid} and s.checkstate=1 and e.deleted=1 and pc.dispenseway=2 and pc.correcttype=2
         group by s.msid
         <if test="param.checktype==0">having 100>checkrate</if>
@@ -223,7 +231,7 @@
         inner join ms_paper_check pc on pc.msid = s.msid
         inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid
         inner join ms_class_student cs on cs.examid = e.examid and cs.subjectid = s.subjectid and cs.classid = pct.mblockid
-        inner join ms_paper_student_question psb on psb.studentid = cs.studentid and psb.mpid = pc.mpid
+        inner join ms_paper_student_question psb on psb.studentid = cs.studentid and psb.mpid = pc.mpid and psb.checked!=0
         where e.schoolid=#{param.schoolid} and s.checkstate=1 and e.deleted=1 and pc.dispenseway=2 and pc.correcttype=1
         group by s.msid
         <if test="param.checktype==0">having 100>checkrate</if>
@@ -252,7 +260,7 @@
             ,count(distinct if(psb.firstcime is null,psb.mpsbid,null))+count(distinct if(pc.checktype=2 and psb.secondctime is null,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 pc.dispenseway=2) and psb.checked!=2
+            or (psb.secondctime is null and psb.secondcid=#{param.handleid}) or pc.dispenseway=2) and psb.checked in(1,2)
             ,psb.mpsbid,null)) as myUncheckedNum
             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 pc.dispenseway=2)
@@ -266,11 +274,11 @@
             select pb.qorder,pb.qn
             ,pc.mblockid,pc.checktype,pc.dispenseway,pc.numtype
             ,count(distinct psb.mpsqid)*pc.checktype as totalNum
-            ,count(distinct if(psb.firstcime is not null,psb.mpsqid,null))+count(distinct if(psb.secondctime is not null,psb.mpsqid,null)) as totalCheckedNum
+            ,count(distinct if(psb.firstcime>0,psb.mpsqid,null))+count(distinct if(psb.secondctime>0,psb.mpsqid,null)) as totalCheckedNum
             ,count(distinct if(psb.firstcime is null,psb.mpsqid,null))+count(distinct if(pc.checktype=2 and psb.secondctime is null,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>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 pc.dispenseway=2) and psb.checked!=2
+            or (psb.secondctime is null and psb.secondcid=#{param.handleid}) or pc.dispenseway=2) and psb.checked in(1,2)
             ,psb.mpsqid,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 pc.dispenseway=2) and psb.answered=1
@@ -288,7 +296,7 @@
             ,count(distinct if(psb.firstcime is null,psb.mpsqid,null))+count(distinct if(pc.checktype=2 and psb.secondctime is null,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 pc.dispenseway=2) and psb.checked!=2
+            or (psb.secondctime is null and psb.secondcid=#{param.handleid}) or pc.dispenseway=2) and psb.checked in(1,2)
             ,psb.mpsqid,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
@@ -354,7 +362,7 @@
         ,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}
+        where pc.checkstate=1 and psb.checked in(1,2) and pc.mpid=#{param.mpid}
         group by pc.mblockid
         order by pc.mpcid
     </select>
@@ -376,13 +384,15 @@
             ,psb.firstccore,psb.secondcscore,psb.firstccores,psb.secondcscores
             from ms_paper_student_block psb
             where psb.mpid=#{param.mpid} and psb.mblockid = #{param.mblockid}
-            and (psb.checked=1 or (psb.checked=2 and (psb.firstcid=#{param.teacherid}
+            and (psb.checked=1 or (psb.checked=2 and ((psb.firstcid=#{param.teacherid} and psb.firstcime is null)
             <if test="param.checktype==2">
-                or psb.secondcid=#{param.teacherid}
+                or (psb.secondcid=#{param.teacherid} and psb.secondctime is null)
+                or (psb.firstcid!=#{param.teacherid} and psb.secondcid is null)
+                or (psb.secondcid!=#{param.teacherid} and psb.firstcid is null)
             </if>
             )))
             and psb.hasproblem=0
-            order by field(psb.checked,1,0,2)
+            order by field(psb.checked,2,1,3)
             limit 1
         </if>
     </select>
@@ -394,13 +404,14 @@
         <result property="mblockid" column="mblockid"/>
         <result property="mpid" column="mpid"/>
         <result property="checktype" column="checktype"/>
+        <result property="checkstate" column="checkstate"/>
         <result property="totalNum" column="totalNum"/>
         <result property="checkedNum" column="checkedNum"/>
         <result property="uncheckedNum" column="uncheckedNum"/>
         <collection property="teachers" select="listCheckTeacher" column="mblockid"/>
     </resultMap>
     <select id="listByQuestion" resultMap="questionResultMap">
-        select q.qorder,q.qn,q.qscore,q.mptqid as mblockid,q.mpid,pc.checktype
+        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
@@ -445,13 +456,14 @@
         <result property="mblockid" column="mblockid"/>
         <result property="mpid" column="mpid"/>
         <result property="checktype" column="checktype"/>
+        <result property="checkstate" column="checkstate"/>
         <result property="totalNum" column="totalNum"/>
         <result property="checkedNum" column="checkedNum"/>
         <result property="uncheckedNum" column="uncheckedNum"/>
         <collection property="teachers" select="listCheckTeacher" column="mblockid"/>
     </resultMap>
     <select id="listByClass" resultMap="classResultMap">
-        select c.classname,c.classid as mblockid,pc.mpid,pc.checktype
+        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
@@ -481,7 +493,7 @@
         ,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}
+        where pc.checkstate=1 and psb.checked in(1,2) and pc.mpid=#{param.mpid}
         group by pc.mblockid
         order by pc.mpcid
     </select>
@@ -503,13 +515,15 @@
             ,psb.firstccore,psb.secondcscore
             from ms_paper_student_question psb
             where psb.mpid=#{param.mpid} and psb.mptqid = #{param.mblockid}
-            and (psb.checked=1 or (psb.checked=2 and (psb.firstcid=#{param.teacherid}
+            and (psb.checked=1 or (psb.checked=2 and ((psb.firstcid=#{param.teacherid} and psb.firstcime is null)
             <if test="param.checktype==2">
-                or psb.secondcid=#{param.teacherid}
+                or (psb.secondcid=#{param.teacherid} and psb.secondctime is null)
+                or (psb.firstcid!=#{param.teacherid} and psb.secondcid is null)
+                or (psb.secondcid!=#{param.teacherid} and psb.firstcid is null)
             </if>
             )))
             and psb.hasproblem=0
-            order by field(psb.checked,1,0,2)
+            order by field(psb.checked,2,1,3)
             limit 1
         </if>
     </select>
@@ -519,7 +533,7 @@
         ,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}
+        where pc.checkstate=1 and psb.checked in(1,2) and pc.mpid=#{param.mpid}
         group by pc.mblockid
         order by pc.mpcid
     </select>
@@ -541,13 +555,15 @@
             ,psb.firstccore,psb.secondcscore
             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=1 or (psb.checked=2 and (psb.firstcid=#{param.teacherid}
+            and (psb.checked=1 or (psb.checked=2 and ((psb.firstcid=#{param.teacherid} and psb.firstcime is null)
             <if test="param.checktype==2">
-                or psb.secondcid=#{param.teacherid}
+                or (psb.secondcid=#{param.teacherid} and psb.secondctime is null)
+                or (psb.firstcid!=#{param.teacherid} and psb.secondcid is null)
+                or (psb.secondcid!=#{param.teacherid} and psb.firstcid is null)
             </if>
             )))
             and psb.hasproblem=0
-            order by field(psb.checked,1,0,2),psb.mptqid
+            order by field(psb.checked,2,1,3),psb.mptqid
             limit 1
         </if>
     </select>
@@ -619,7 +635,7 @@
         order by pctt.taskorder desc
     </select>
     <!--教师阅卷-历史详情-->
-    <select id="detailCorrect" resultType="java.util.Map">
+    <select id="detailHistory" resultType="java.util.Map">
         select psq.stuanswer,pctt.checkscore,pctt.hasproblem,pctt.problemtype,pctt.problemcomm
         ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid,pctt.taskorder
         from ms_paper_check_teacher_task pctt
@@ -629,6 +645,7 @@
         <if test="param.correcttype!=3">
             inner join ms_paper_student_question psq on pctt.mpsbid=psq.mpsqid
         </if>
+        where pctt.mpcttid=#{param.mpcttid}
     </select>
     <!--教师阅卷-平均分-->
     <select id="avgScore" resultType="java.util.Map">
@@ -643,27 +660,35 @@
     </select>
     <!--教师阅卷-待批阅数量-->
     <select id="getPendingCorrectNum" resultType="java.lang.Integer">
-        select count(if(pc.correcttype=3,if(pc.dispenseway=2
-        ,(select psb.mpsbid from ms_paper_student_block psb
-        where psb.mpid=pct.mpid and psb.mblockid=pct.mblockid and psb.checked!=2 and psb.hasproblem=0 and psb.firstcid!=pct.teacherid and psb.secondcid!=pct.teacherid)
-        ,(select pctt.mpcttid from ms_paper_check_teacher_task pctt where pctt.mpid = pc.mpid and pctt.teacherid = #{param.handleid} and pctt.checkstate!=3)
+        select sum(a.num) from(select if(pc.correcttype=3,if(pc.dispenseway=2
+        ,(select count(psb.mpsbid) from ms_paper_student_block psb
+        where psb.mpid=pct.mpid and psb.mblockid=pct.mblockid and psb.hasproblem=0
+        and (psb.checked=1 or (psb.checked=2 and ((psb.firstcid=pct.teacherid and psb.firstcime is null)
+            or (psb.secondcid=pct.teacherid and psb.secondctime is null)))))
+        ,(select count(pctt.mpcttid) from ms_paper_check_teacher_task pctt where pctt.mpid = pc.mpid and pctt.teacherid = #{param.handleid} and pctt.checkstate!=3)
         ),if(pc.dispenseway=2
-        ,(select psb.mpsqid from ms_paper_student_question psb
-        where psb.mpid=pct.mpid and psb.mblockid=pct.mblockid and psb.checked!=2 and psb.hasproblem=0 and psb.firstcid!=pct.teacherid and psb.secondcid!=pct.teacherid)
-        ,(select pctt.mpcttid from ms_paper_check_teacher_task pctt where  pctt.mpid = pc.mpid and pctt.teacherid = #{param.handleid} and pctt.checkstate!=3)
-        ))) as num
+        ,if(pc.correcttype=2,(select count(psb.mpsqid) from ms_paper_student_question psb
+        where psb.mpid=pct.mpid and psb.mptqid=pct.mblockid and psb.hasproblem=0
+        and (psb.checked=1 or (psb.checked=2 and ((psb.firstcid=pct.teacherid and psb.firstcime is null)
+        or (psb.secondcid=pct.teacherid and psb.secondctime is null)))))
+        ,(select count(psb.mpsqid) from ms_paper_student_question psb
+        inner join ms_class c on c.examid=psb.examid and c.subjectid=psb.subjectid and c.classid=pct.mblockid
+        inner join ms_class_student cs on c.examid=cs.examid and c.subjectid=cs.subjectid and pc.mblockid=cs.classid
+        where psb.mpid=pct.mpid and psb.mptqid=pct.mblockid and psb.hasproblem=0 and psb.studentid=cs.studentid
+        and (psb.checked=1 or (psb.checked=2 and ((psb.firstcid=pct.teacherid and psb.firstcime is null)
+        or (psb.secondcid=pct.teacherid and psb.secondctime is null))))))
+        ,(select count(pctt.mpcttid) from ms_paper_check_teacher_task pctt where  pctt.mpid = pc.mpid and pctt.teacherid = #{param.handleid} and pctt.checkstate!=3)
+        )) as num
         from ms_paper_check pc inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid = pc.mpid
-        where pc.checkstate=1 and pct.teacherid = #{param.handleid}
+        where pc.checkstate=1 and pct.teacherid = #{param.handleid}) as a
     </select>
     <!--教师阅卷-待仲裁数量-->
     <select id="getPendingArbitrateNum" resultType="java.lang.Integer">
-        select count(case when pc.correcttype=3 then(select psb.mpsbid from ms_paper_student_block psb
+        select sum(a.num) from(select if(pc.correcttype=3,(select count(psb.mpsbid) from ms_paper_student_block psb
         where psb.mpid=pc.mpid and psb.mblockid=pc.mblockid and psb.arbitratestate=1)
-        when pc.correcttype=2 then (select psb.mpsqid from ms_paper_student_question psb
-        where psb.mpid=pc.mpid and psb.mptqid=pc.mblockid and psb.arbitratestate=1)
-        else (select psb.mpsqid from ms_paper_student_question psb inner join ms_class_student c on psb.examid=c.examid and psb.subjectid=c.subjectid and psb.studentid=c.studentid
-        where psb.mpid=pc.mpid and c.classid=pc.mblockid and psb.arbitratestate=1) end) as num
+        ,(select count(psb.mpsqid) from ms_paper_student_question psb
+        where psb.mpid=pc.mpid and psb.mptqid=pc.mblockid and psb.arbitratestate=1)) as num
         from ms_paper_check pc
-        where pc.checkstate=1 and pc.arbitrateid = #{param.handleid}
+        where pc.checkstate=1 and pc.arbitrateid = #{param.handleid}) as a
     </select>
 </mapper>