批阅

scommons/src/main/java/com/xhkjedu/exception/ErrorAdivceController.java

@@ -64,5 +64,11 @@ public class ErrorAdivceController {
         return new ResultVo(1, "请求参数错误");
     }
 
+    @ExceptionHandler(ServiceException.class)
+    public ResultVo missingParametersException(ServiceException ex) {
+        log.error("提示信息:   -------> {}", ex.getMessage());
+        return new ResultVo(1, ex.getMessage());
+    }
+
 
 }

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

@@ -120,6 +120,34 @@ public class MsPaperCheckTeacherTaskController {
         return new ResultVo(0, "查询成功", list);
     }
 
+    /**
+     * @Description 教师阅卷-试题列表
+     * @Date 2024/11/13 17:59
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_teacher_question")
+    public ResultVo listTeacherQuestion(@RequestBody MsCheckParam param) {
+        N_Utils.validation(new Object[]{param.getHandleid(), "操作人ID", 1, param.getMpid(), "试卷ID", 1});
+        List<Map> list = msPaperCheckTeacherTaskService.listTeacherQuestion(param);
+        return new ResultVo(0, "查询成功", list);
+    }
+
+    /**
+     * @Description 教师阅卷-班级列表
+     * @Date 2024/11/14 9:41
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_teacher_class")
+    public ResultVo listTeacherClass(@RequestBody MsCheckParam param) {
+        N_Utils.validation(new Object[]{param.getHandleid(), "操作人ID", 1, param.getMpid(), "试卷ID", 1});
+        List<Map> list = msPaperCheckTeacherTaskService.listTeacherClass(param);
+        return new ResultVo(0, "查询成功", list);
+    }
+
     /**
      * @Description 获取待批题块
      * @Date 2024/10/31 11:02
@@ -148,6 +176,7 @@ public class MsPaperCheckTeacherTaskController {
                 , param.getMblockid(), "题块ID", 1
                 , param.getChecktype(), "批阅情况", 1
                 , param.getMpsbid(), "学生试题ID", 1
+                , param.getQscore(), "试题分值", 2
         });
         msPaperCheckTeacherTaskService.correct(param);
         return new ResultVo(0, "保存成功");
@@ -183,4 +212,62 @@ public class MsPaperCheckTeacherTaskController {
         List<Map> list = msPaperCheckTeacherTaskService.detailByQuestion(mpid, mblockid);
         return new ResultVo(0, "查询成功", list);
     }
+
+    /**
+     * @Description 教师阅卷-上一份
+     * @Date 2024/11/14 10:27
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/get_pre_correct")
+    public ResultVo getPreCorrect(@RequestBody MsCheckParam param) {
+        N_Utils.validation(new Object[]{
+                param.getHandleid(), "操作人ID", 1
+                , param.getMpid(), "试卷ID", 1
+                , param.getMblockid(), "题块ID", 1
+                , param.getTaskorder(), "序号", 1
+        });
+        return new ResultVo(0, "查询成功", msPaperCheckTeacherTaskService.getPreCorrect(param));
+    }
+
+    /**
+     * @Description 教师阅卷-阅卷历史
+     * @Date 2024/11/14 14:12
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_correct")
+    public ResultVo listCorrect(@RequestBody MsCheckParam param) {
+        Integer page = param.getPage();
+        Integer size = param.getPageSize();
+        N_Utils.validation(new Object[]{
+                param.getHandleid(), "操作人ID", 1
+                , param.getMpid(), "试卷ID", 1
+                , param.getMblockid(), "题块ID", 1
+                , page, "显示页码", 1
+                , size, "显示条数", 1
+        });
+        PageHelper.startPage(page, size);
+        List<Map> list = msPaperCheckTeacherTaskService.listCorrect(param);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "查询成功", pageResult);
+    }
+
+    /**
+     * @Description 教师阅卷-历史详情
+     * @Date 2024/11/14 17:32
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/detail_correct")
+    public ResultVo detailCorrect(@RequestBody MsCheckParam param) {
+        N_Utils.validation(new Object[]{
+                param.getMpcttid(), "任务ID", 1
+                , param.getMpid(), "试卷ID", 1
+        });
+        return new ResultVo(0, "查询成功", msPaperCheckTeacherTaskService.detailCorrect(param));
+    }
 }

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

@@ -44,6 +44,12 @@ public interface MsPaperCheckTeacherTaskMapper extends TkMapper<MsPaperCheckTeac
     //教师阅卷-题块列表
     List<Map> listTeacherBlock(@Param("param") MsCheckParam param);
 
+    //教师阅卷-试题列表
+    List<Map> listTeacherQuestion(@Param("param") MsCheckParam param);
+
+    //教师阅卷-班级列表
+    List<Map> listTeacherClass(@Param("param") MsCheckParam param);
+
     //教师阅卷-待批题块列表
     List<MsPaperCheck> listBlockCheck(@Param("param") MsCheckParam param);
 
@@ -81,4 +87,13 @@ public interface MsPaperCheckTeacherTaskMapper extends TkMapper<MsPaperCheckTeac
 
     //教师批阅-批阅试题
     void correct(@Param("param") MsPaperCheckVo param);
+
+    //教师阅卷-上一份
+    Map getPreCorrect(@Param("param") MsCheckParam param);
+
+    //教师阅卷-阅卷历史
+    List<Map> listCorrect(@Param("param") MsCheckParam param);
+
+    //教师阅卷-历史详情
+    Map detailCorrect(@Param("param") MsCheckParam param);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsPaperBlockQuestion.java

@@ -39,6 +39,8 @@ public class MsPaperBlockQuestion extends BaseBean {
     private String mergeqn;
     //合并给分点试卷试题分值集合
     private String mergescore;
+    @Transient
+    private String mergestuscore;
     //给分步长方式1等间隔2特定分数
     private Integer scorestepway;
     //给分步长内容

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

@@ -21,6 +21,8 @@ public class MsPaperCheckTeacherTask extends BaseBean {
     private Integer mpid;
     //题块/试题/班级ID
     private Integer mblockid;
+    //考试试题表id
+    private Integer mptqid;
     //教师ID
     private Integer teacherid;
     //序号
@@ -35,4 +37,14 @@ public class MsPaperCheckTeacherTask extends BaseBean {
     private Integer checktype;
     //创建时间
     private Integer createtime;
+    //优秀试卷0默认1优秀
+    private Integer hasgood;
+    //违纪试卷0默认1违纪
+    private Integer hasbad;
+    //疑难0默认1疑难
+    private Integer hasproblem;
+    //疑难类型1图形模糊2答题错位3没有图像4图像颠倒5其他问题
+    private Integer problemtype;
+    //疑难备注
+    private String problemcomm;
 }

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

@@ -8,8 +8,7 @@ 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.MsPaperBlockQuestion;
-import com.xhkjedu.smarking.model.papercheck.MsPaperCheck;
-import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher;
+import com.xhkjedu.smarking.model.papercheck.*;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.utils.MarkingUtil;
@@ -140,10 +139,33 @@ public class MsPaperCheckTeacherTaskService {
      * @Return java.util.List<java.util.Map>
      **/
     public List<Map> listTeacherBlock(MsCheckParam param) {
-        setParam(param);
         return msPaperCheckTeacherTaskMapper.listTeacherBlock(param);
     }
 
+    /**
+     * @Description 教师阅卷-试题列表
+     * @Date 2024/11/13 17:59
+     * @Author YWX
+     * @Param [param]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listTeacherQuestion(MsCheckParam param) {
+        Integer correcttype = msPaperMapper.getCorrectTypeByMpId(param.getMpid());
+        param.setCorrecttype(correcttype);
+        return msPaperCheckTeacherTaskMapper.listTeacherQuestion(param);
+    }
+
+    /**
+     * @Description 教师阅卷-班级列表
+     * @Date 2024/11/14 9:41
+     * @Author YWX
+     * @Param [param]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listTeacherClass(MsCheckParam param) {
+        return msPaperCheckTeacherTaskMapper.listTeacherClass(param);
+    }
+
     /**
      * @Description 获取待批题块
      * @Date 2024/10/31 11:01
@@ -206,10 +228,6 @@ public class MsPaperCheckTeacherTaskService {
             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)) {
@@ -221,6 +239,25 @@ public class MsPaperCheckTeacherTaskService {
                     checktype = 1;
                 }
             }
+            if (!dispenseway.equals(2)) {
+                //更新教师阅卷任务状态
+                msPaperCheckTeacherTaskMapper.updateCheckStatus(sq.getMpid(), sq.getMpsbid(), handleid, 2);
+            } else {
+                //序号
+                Integer taskorder = checkedNum + 1;
+                sq.setTaskorder(taskorder);
+                MsPaperCheckTeacherTask task = new MsPaperCheckTeacherTask();
+                task.setMpid(sq.getMpid());
+                task.setMblockid(sq.getMblockid());
+                task.setMptqid(sq.getMptqid());
+                task.setTeacherid(handleid);
+                task.setTaskorder(taskorder);
+                task.setMpsbid(sq.getMpsbid());
+                task.setCheckstate(2);
+                task.setChecktype(checktype);
+                task.setCreatetime(N_Utils.getSecondTimestamp());
+                msPaperCheckTeacherTaskMapper.insertSelective(task);
+            }
             if (correcttype.equals(3)) {//按题块批阅
                 MsPaperStudentBlock block = new MsPaperStudentBlock();
                 block.setMpsbid(sq.getMpsbid());
@@ -313,11 +350,13 @@ public class MsPaperCheckTeacherTaskService {
         List<MsPaperBlockQuestion> questions = param.getQuestions();
         int checked = 1;
         Double firstccore = param.getFirstccore();
+        String checkscore;
         if (checktype.equals(1)) {//单评
             if (hasproblem.equals(0)) {
                 checked = 2;
             }
             if (correcttype.equals(3)) {//按题块批阅
+                checkscore = questions.stream().map(MsPaperBlockQuestion::getMergescore).collect(Collectors.joining(";"));
                 //题块批阅信息
                 MsPaperStudentBlock block = new MsPaperStudentBlock();
                 block.setMpsbid(mpsbid);
@@ -344,12 +383,12 @@ public class MsPaperCheckTeacherTaskService {
                         studentQuestions.add(studentQuestion);
                     } else {
                         String[] mptqids = question.getMergeqid().split(",");
-                        String[] mergescores = question.getMergescore().split(",");
-                        double[] scores = new double[mergescores.length];
-                        int last = mergescores.length - 1;
+                        String[] mergestuscore = question.getMergestuscore().split(",");
+                        double[] scores = new double[mergestuscore.length];
+                        int last = mergestuscore.length - 1;
                         double score = 0;
-                        for (int i = 0; i < mergescores.length; i++) {
-                            scores[i] = MarkingUtil.mul(MarkingUtil.div(mergescores[i], qscore), stuscore);
+                        for (int i = 0; i < mergestuscore.length; i++) {
+                            scores[i] = MarkingUtil.mul(MarkingUtil.div(mergestuscore[i], qscore), stuscore);
                             score = MarkingUtil.add(score, scores[i]);
                             if (i == last) {
                                 scores[i] = MarkingUtil.sub(stuscore, score);
@@ -366,6 +405,7 @@ public class MsPaperCheckTeacherTaskService {
                 }
                 msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, block);//更新学生单题批阅信息
             } else {//按试题批阅
+                checkscore = firstccore.toString();
                 MsPaperStudentQuestion question = new MsPaperStudentQuestion();
                 question.setMpsqid(mpsbid);
                 question.setChecked(checked);
@@ -408,6 +448,9 @@ public class MsPaperCheckTeacherTaskService {
                 } else if (scoreway.equals(1)) {
                     double addScore = MarkingUtil.add(firstccore, secondcscore);
                     endscore = getUserScore(finalscore, addScore, roundvalue);
+                    if (endscore.compareTo(qscore) > 0) {
+                        endscore = qscore;
+                    }
                 }
             }
             if (correcttype.equals(3)) {//按题块批阅
@@ -435,6 +478,7 @@ public class MsPaperCheckTeacherTaskService {
                 for (int j = 0; j < questions.size(); j++) {
                     MsPaperBlockQuestion question = questions.get(j);
                     Double stuscore = question.getStuscore();
+                    Double bqscore = question.getBqscore();
                     if (N_Utils.isTrueInteger(question.getMptqid())) {
                         MsPaperStudentQuestion studentQuestion = new MsPaperStudentQuestion();
                         studentQuestion.setMptqid(question.getMptqid());
@@ -454,6 +498,9 @@ public class MsPaperCheckTeacherTaskService {
                             } else if (scoreway.equals(2)) {
                                 double addScore = MarkingUtil.add(stuscore, cores[j]);
                                 endscore = getUserScore(finalscore, addScore, roundvalue);
+                                if (endscore.compareTo(bqscore) > 0) {
+                                    endscore = bqscore;
+                                }
                                 studentQuestion.setStuscore(endscore);
                             }
                         }
@@ -461,11 +508,12 @@ public class MsPaperCheckTeacherTaskService {
                     } else {
                         String[] mptqids = question.getMergeqid().split(",");
                         String[] mergescores = question.getMergescore().split(",");
-                        double[] scores = new double[mergescores.length];
-                        int last = mergescores.length - 1;
+                        String[] mergestuscore = question.getMergestuscore().split(",");
+                        double[] scores = new double[mergestuscore.length];
+                        int last = mergestuscore.length - 1;
                         double score = 0;
-                        for (int i = 0; i < mergescores.length; i++) {
-                            scores[i] = MarkingUtil.mul(MarkingUtil.div(mergescores[i], qscore), stuscore);
+                        for (int i = 0; i < mergestuscore.length; i++) {
+                            scores[i] = MarkingUtil.mul(MarkingUtil.div(mergestuscore[i], qscore), stuscore);
                             score = MarkingUtil.add(score, scores[i]);
                             if (i == last) {
                                 scores[i] = MarkingUtil.sub(stuscore, score);
@@ -491,6 +539,10 @@ public class MsPaperCheckTeacherTaskService {
                                 } else if (scoreway.equals(2)) {
                                     double addScore = MarkingUtil.add(scores[i], cores2[i]);
                                     endscore = getUserScore(finalscore, addScore, roundvalue);
+                                    double mqscore = Double.parseDouble(mergescores[i]);
+                                    if (endscore.compareTo(mqscore) > 0) {
+                                        endscore = mqscore;
+                                    }
                                     studentQuestion.setStuscore(endscore);
                                 }
                             }
@@ -510,15 +562,18 @@ public class MsPaperCheckTeacherTaskService {
                 msPaperStudentBlockMapper.updateByPrimaryKeySelective(block);
 
                 msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, block);//更新学生单题批阅信息
+                checkscore = stuscores;
             } else {//按试题批阅
                 MsPaperStudentQuestion question = new MsPaperStudentQuestion();
                 question.setChecked(checked);
                 if (type.equals(1)) {
                     question.setFirstcime(N_Utils.getSecondTimestamp());
                     question.setFirstccore(firstccore);
+                    checkscore = firstccore.toString();
                 } else {
                     question.setSecondctime(N_Utils.getSecondTimestamp());
                     question.setSecondcscore(secondcscore);
+                    checkscore = secondcscore.toString();
                 }
                 question.setHasgood(hasgood);
                 question.setHasbad(hasbad);
@@ -529,6 +584,10 @@ public class MsPaperCheckTeacherTaskService {
                 question.setMpsqid(mpsbid);
             }
         }
+        param.setHasproblem(hasproblem);
+        param.setProblemtype(problemtype);
+        param.setProblemcomm(problemcomm);
+        param.setCheckscore(checkscore);
         msPaperCheckTeacherTaskMapper.correct(param);
     }
 
@@ -544,4 +603,44 @@ public class MsPaperCheckTeacherTaskService {
         }
         return score;
     }
+
+    /**
+     * @Description 教师阅卷-上一份
+     * @Date 2024/11/14 10:35
+     * @Author YWX
+     * @Param [param]
+     * @Return java.util.Map
+     **/
+    public Map getPreCorrect(MsCheckParam param) {
+        Integer correcttype = msPaperMapper.getCorrectTypeByMpId(param.getMpid());
+        if (correcttype.equals(1) && !N_Utils.isTrueInteger(param.getMptqid())) {
+            throw new ServiceException("考试试题表id不能为空");
+        }
+        param.setCorrecttype(correcttype);
+        return msPaperCheckTeacherTaskMapper.getPreCorrect(param);
+    }
+
+    /**
+     * @Description 教师阅卷-阅卷历史
+     * @Date 2024/11/14 14:13
+     * @Author YWX
+     * @Param [param]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listCorrect(MsCheckParam param) {
+        return msPaperCheckTeacherTaskMapper.listCorrect(param);
+    }
+
+    /**
+     * @Description 教师阅卷-历史详情
+     * @Date 2024/11/14 17:33
+     * @Author YWX
+     * @Param [param]
+     * @Return java.util.Map
+     **/
+    public Map detailCorrect(MsCheckParam param) {
+        Integer correcttype = msPaperMapper.getCorrectTypeByMpId(param.getMpid());
+        param.setCorrecttype(correcttype);
+        return msPaperCheckTeacherTaskMapper.detailCorrect(param);
+    }
 }

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

@@ -32,4 +32,10 @@ public class MsCheckParam extends BaseBean {
     private Integer dispenseway;
     //考试试题表id
     private Integer mptqid;
+    //批阅设置：1按班设置2按题设置3按题块设置
+    private Integer correcttype;
+    //序号
+    private Integer taskorder;
+    //阅卷批阅教师任务ID
+    private Integer mpcttid;
 }

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

@@ -16,6 +16,8 @@ public class MsPaperCheckVo {
     private Integer mpid;
     //题块ID
     private Integer mblockid;
+    //考试试题表id
+    private Integer mptqid;
     //阅卷试卷学生题块ID
     private Integer mpsbid;
     //阅卷试卷学生合并后试题ID
@@ -71,6 +73,8 @@ public class MsPaperCheckVo {
     private Integer hasbad;
     //学生ID
     private Integer studentid;
+    //序号
+    private Integer taskorder;
     //题块试题列表
     private List<MsPaperBlockQuestion> questions;
 }

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

@@ -38,8 +38,17 @@
     <!--教师批阅-批阅试题-->
     <update id="correct">
         update ms_paper_check_teacher_task
-        set checkstate = 3,checkscore = #{checkscore}
-        where mpid=#{mpid} and mpsbid=#{mpsbid} and teacherid=#{teacherid}
+        set checkstate = 3,checkscore = #{param.checkscore}
+        <if test="param.hasgood!=null and param.hasgood!=0">
+            ,hasgood=#{param.hasgood}
+        </if>
+        <if test="param.hasbad!=null and param.hasbad!=0">
+            ,hasbad=#{param.hasbad},problemtype=#{param.problemtype}
+        </if>
+        <if test="param.problemcomm!=null and param.problemcomm!=''">
+            ,problemcomm=#{param.problemcomm}
+        </if>
+        where mpid=#{param.mpid} and mpsbid=#{param.mpsbid} and teacherid=#{param.handleid}
     </update>
     <!--删除教师阅卷任务-->
     <delete id="deleteByMpsbids">
@@ -240,6 +249,32 @@
         group by pb.mblockid
         order by pb.blockorder
     </select>
+    <!--教师阅卷-试题列表-->
+    <select id="listTeacherQuestion" resultType="java.util.Map">
+        <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)
+            group by pb.mptqid
+            order by pb.qorder,pb.qn
+        </if>
+        <if test="param.correcttype==2">
+            select pct.mblockid,pb.qorder,pb.qn,pb.qscore
+            from ms_paper_qtype_question pb inner join ms_paper_check_teacher pct on pb.mptqid = pct.mblockid
+            and pct.teacherid = #{param.handleid}
+            where pb.mpid=#{param.mpid}
+            group by pb.mptqid
+            order by pb.qorder,pb.qn
+        </if>
+    </select>
+    <!--教师阅卷-班级列表-->
+    <select id="listTeacherClass" resultType="java.util.Map">
+        select pct.mblockid,c.classname,c.classtype
+        from ms_paper_check_teacher pct inner join ms_paper p on pct.mpid = p.mpid
+        inner join ms_class c on pct.mblockid = c.classid and c.examid = p.examid and c.subjectid = p.subjectid
+        where pct.mpid=#{param.mpid} and pct.teacherid = #{param.handleid}
+        order by c.mcid
+    </select>
     <!--教师阅卷-待批题块列表-->
     <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
@@ -253,7 +288,7 @@
     <!--教师阅卷-按题块-获取待批试题-->
     <select id="getCorrectBlock" 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
+            select pctt.mblockid,pctt.mpsbid,pctt.checktype,pctt.taskorder,psb.stuanswer,psb.checked
             ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime,psb.studentid
             ,psb.firstccore,psb.secondcscore,psb.firstccores,psb.secondcscores
             from ms_paper_student_block psb inner join ms_paper_check_teacher_task pctt on psb.mpsbid = pctt.mpsbid and psb.mpid=pctt.mpid
@@ -344,7 +379,7 @@
     <!--教师阅卷-按试题-获取待批试题-->
     <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
+            select pctt.mblockid,pctt.mpsbid,pctt.checktype,pctt.taskorder,psb.stuanswer,psb.checked
             ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
             ,psb.firstccore,psb.secondcscore
             from ms_paper_student_question psb inner join ms_paper_check_teacher_task pctt on psb.mpsqid = pctt.mpsbid and psb.mpid=pctt.mpid
@@ -382,7 +417,7 @@
     <!--教师阅卷-按班级-获取待批试题-->
     <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
+            select pctt.mblockid,pctt.mpsbid,pctt.checktype,pctt.taskorder,psb.stuanswer,psb.checked
             ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime,psb.mptqid
             ,psb.firstccore,psb.secondcscore
             from ms_paper_student_question psb inner join ms_paper_check_teacher_task pctt on psb.mpsqid = pctt.mpsbid and psb.mpid=pctt.mpid
@@ -436,4 +471,54 @@
             </if>
         </if>
     </select>
+    <!--教师阅卷-上一份-->
+    <select id="getPreCorrect" resultType="java.util.Map">
+        select psq.stuanswer
+        <if test="param.correcttype==3">
+             ,if(pctt.checktype=1,psq.firstccores,psq.secondcscores) as stuscore
+        </if>
+        <if test="param.correcttype!=3">
+            ,if(pctt.checktype=1,psq.firstccore,psq.secondcscore) as stuscore
+        </if>
+        from ms_paper_check_teacher_task pctt
+        <if test="param.correcttype==3">
+            inner join ms_paper_student_block psq on pctt.mpsbid=psq.mpsbid
+        </if>
+        <if test="param.correcttype!=3">
+            inner join ms_paper_student_question psq on pctt.mpsbid=psq.mpsqid
+        </if>
+        where pctt.mpid=#{param.mpid} and pctt.mblockid=#{param.mblockid} and pctt.teacherid=#{param.handleid}
+        and pctt.checkstate=3 and #{param.taskorder}>pctt.taskorder
+        <if test="param.mptqid!=null and param.mptqid!=0">
+            and pctt.mptqid=#{param.mptqid}
+        </if>
+        order by pctt.taskorder desc limit 1
+    </select>
+    <!--教师阅卷-阅卷历史-->
+    <select id="listCorrect" resultType="java.util.Map">
+        select pctt.mpcttid,pctt.taskorder,pctt.checkscore
+        ,(case when pctt.hasgood=1 then '优' when pctt.hasbad=1 then '违' when pctt.hasproblem=1 then '疑' else '' end) as comm
+        from ms_paper_check_teacher_task pctt
+        where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.handleid}
+        and pctt.checkstate=3
+        <if test="param.mptqid!=null and param.mptqid!=0">
+            and pctt.mptqid=#{param.mptqid}
+        </if>
+        <if test="param.taskorder!=null and param.taskorder!=0">
+            and pctt.taskorder=#{param.taskorder}
+        </if>
+        order by pctt.taskorder desc
+    </select>
+    <!--教师阅卷-历史详情-->
+    <select id="detailCorrect" 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
+        <if test="param.correcttype==3">
+            inner join ms_paper_student_block psq on pctt.mpsbid=psq.mpsbid
+        </if>
+        <if test="param.correcttype!=3">
+            inner join ms_paper_student_question psq on pctt.mpsbid=psq.mpsqid
+        </if>
+    </select>
 </mapper>