批阅、仲裁、疑难卷

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

@@ -90,6 +90,7 @@ public class MsPaperCheckTeacherArbitrateController {
                 , param.getMpid(), "试卷ID", 1
                 , param.getMblockid(), "题块ID", 1
                 , param.getCorrecttype(), "批阅设置", 1
+                , param.getTaskorder(), "序号", 1
         });
         return new ResultVo(0, "查询成功", msPaperCheckTeacherArbitrateService.getPreArbitrate(param));
     }
@@ -109,6 +110,7 @@ public class MsPaperCheckTeacherArbitrateController {
                 , param.getMblockid(), "题块ID", 1
                 , param.getMpsbid(), "任务ID", 1
                 , param.getQscore(), "试题分值", 2
+                , param.getCorrecttype(), "批阅设置", 1
         });
         param.setFinalreason(1);
         msPaperCheckTeacherArbitrateService.arbitrate(param);
@@ -148,7 +150,7 @@ public class MsPaperCheckTeacherArbitrateController {
         Integer handleid = param.getHandleid();
         Integer mpid = param.getMpid();
         N_Utils.validation(new Object[]{handleid, "操作人ID", 1, mpid, "试卷ID", 1});
-        List<Map> list = msPaperCheckTeacherArbitrateService.listPendingArbitrate(mpid, handleid);
+        List<Map> list = msPaperCheckTeacherArbitrateService.listPendingArbitrate(mpid, handleid, 1);
         return new ResultVo(0, "查询成功", list);
     }
 
@@ -161,9 +163,10 @@ public class MsPaperCheckTeacherArbitrateController {
      **/
     @PostMapping("/list_larbitrate")
     public ResultVo listLeaderArbitrate(@RequestBody MsCheckParam param) {
+        Integer handleid = param.getHandleid();
         Integer mpid = param.getMpid();
-        N_Utils.validation(new Object[]{mpid, "试卷ID", 1});
-        List<Map> list = msPaperCheckTeacherArbitrateService.listPendingArbitrate(mpid, null);
+        N_Utils.validation(new Object[]{handleid, "操作人ID", 1, mpid, "试卷ID", 1});
+        List<Map> list = msPaperCheckTeacherArbitrateService.listPendingArbitrate(mpid, handleid, 0);
         return new ResultVo(0, "查询成功", list);
     }
 

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

@@ -36,7 +36,7 @@ public class MsPaperCheckTeacherProblemController {
     @PostMapping("/list_problem")
     public ResultVo listProblem(@RequestBody MsCheckParam param) {
         Integer mpid = param.getMpid();
-        N_Utils.validation(new Object[]{mpid, "试卷ID", 1});
+        N_Utils.validation(new Object[]{param.getHandleid(), "操作人ID", 1, mpid, "试卷ID", 1});
         List<Map> list = msPaperCheckTeacherProblemService.listPendingProblem(mpid);
         return new ResultVo(0, "查询成功", list);
     }
@@ -89,6 +89,7 @@ public class MsPaperCheckTeacherProblemController {
                 , param.getMpid(), "试卷ID", 1
                 , param.getMblockid(), "题块ID", 1
                 , param.getCorrecttype(), "批阅设置", 1
+                , param.getTaskorder(), "序号", 1
         });
         return new ResultVo(0, "查询成功", msPaperCheckTeacherProblemService.getPreProblem(param));
     }

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

@@ -23,7 +23,7 @@ public interface MsPaperCheckTeacherArbitrateMapper extends TkMapper<MsPaperChec
     List<Map> detailArbitrate(@Param("param") MsCheckParam param);
 
     //获取待仲裁任务
-    MsPaperCheckVo getCorrectArbitrate(@Param("param") MsCheckParam param);
+    Map getCorrectArbitrate(@Param("param") MsCheckParam param);
 
     //获取仲裁数量
     MsPaperCheckTeacher getACheckNum(@Param("param") MsCheckParam param);
@@ -38,7 +38,7 @@ public interface MsPaperCheckTeacherArbitrateMapper extends TkMapper<MsPaperChec
     List<Map> listQuestionArbitrate(@Param("param") MsCheckParam param);
 
     //学科组长-获取待仲裁任务
-    MsPaperCheckVo getCorrectLeaderArbitrate(@Param("param") MsCheckParam param);
+    Map getCorrectLeaderArbitrate(@Param("param") MsCheckParam param);
 
     //仲裁历史
     List<Map> listArbitrateHistory(@Param("param") MsCheckParam param);
@@ -51,4 +51,10 @@ public interface MsPaperCheckTeacherArbitrateMapper extends TkMapper<MsPaperChec
 
     //保存或更新单个任务
     void save(@Param("m") MsPaperCheckTeacherArbitrate task);
+
+    //更新仲裁结果
+    void correct(@Param("param") MsPaperCheckVo param);
+
+    //更新仲裁状态
+    void updateArbitrateState(@Param("param") MsCheckParam param);
 }

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

@@ -45,4 +45,10 @@ public interface MsPaperCheckTeacherProblemMapper extends TkMapper<MsPaperCheckT
 
     //打回重阅
     void backCorrect(@Param("param") MsPaperCheckVo param);
+
+    //更新疑难卷状态
+    void updateHasProblem(@Param("param") MsCheckParam param);
+
+    //处理疑难卷
+    void correct(@Param("param") MsPaperCheckVo param);
 }

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

@@ -2,8 +2,7 @@ package com.xhkjedu.smarking.mapper.papercheck;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.papercheck.*;
-import com.xhkjedu.smarking.vo.papercheck.MsCheckParam;
-import com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo;
+import com.xhkjedu.smarking.vo.papercheck.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -115,4 +114,7 @@ public interface MsPaperCheckTeacherTaskMapper extends TkMapper<MsPaperCheckTeac
 
     //教师阅卷-待仲裁数量
     Integer getPendingArbitrateNum(@Param("param") MsCheckParam param);
+
+    //获取批阅结果
+    MsCheckVo getCheckResult(@Param("param") MsPaperCheckVo param);
 }

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

@@ -2,13 +2,13 @@ package com.xhkjedu.smarking.service.papercheck;
 
 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.MsPaperCheckTeacherArbitrateMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
 import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
-import com.xhkjedu.smarking.model.papercheck.*;
+import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher;
+import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacherArbitrate;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.utils.MarkingUtil;
@@ -17,6 +17,7 @@ import com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -31,8 +32,6 @@ public class MsPaperCheckTeacherArbitrateService {
     @Resource
     private MsPaperCheckTeacherArbitrateMapper msPaperCheckTeacherArbitrateMapper;
     @Resource
-    private MsPaperCheckMapper msPaperCheckMapper;
-    @Resource
     private MsPaperMapper msPaperMapper;
     @Resource
     private MsPaperStudentBlockMapper msPaperStudentBlockMapper;
@@ -71,34 +70,42 @@ public class MsPaperCheckTeacherArbitrateService {
      * @Param [param]
      * @Return com.xhkjedu.vo.ResultVo
      **/
+    @Transactional(rollbackFor = Exception.class)
     public ResultVo getCorrectArbitrate(MsCheckParam param) {
-        MsPaper paper = msPaperMapper.selectByPrimaryKey(param.getMpid());
+        Integer mpid = param.getMpid();
+        MsPaper paper = msPaperMapper.selectByPrimaryKey(mpid);
         Integer correcttype = paper.getCorrecttype();
         if (!N_Utils.isTrueInteger(correcttype)) {
             throw new ServiceException("该试卷未设置批阅方式");
         }
         param.setCorrecttype(correcttype);
         param.setSubjectid(paper.getSubjectid());
-        MsPaperCheckVo sq = msPaperCheckTeacherArbitrateMapper.getCorrectArbitrate(param);
+        Map sq = msPaperCheckTeacherArbitrateMapper.getCorrectArbitrate(param);
 
         Integer totalNum = 0;
         Integer checkedNum = 0;
         if (sq != null) {
-            param.setMblockid(sq.getMblockid());
+            Integer mblockid = N_Utils.obj2Int(sq.get("mblockid"));
+            param.setMblockid(mblockid);
             MsPaperCheckTeacher teacher = msPaperCheckTeacherArbitrateMapper.getACheckNum(param);
             totalNum = teacher.getTasknum();
             checkedNum = teacher.getCheckednum();
-            sq.setMpid(param.getMpid());
 
+            msPaperCheckTeacherArbitrateMapper.updateArbitrateState(param);
+
+            //序号
+            Integer taskorder = checkedNum + 1;
+            sq.put("taskorder", taskorder);
             MsPaperCheckTeacherArbitrate arbitrate = new MsPaperCheckTeacherArbitrate();
-            arbitrate.setMpid(param.getMpid());
-            arbitrate.setMblockid(sq.getMblockid());
+            arbitrate.setMpid(mpid);
+            arbitrate.setMblockid(mblockid);
             arbitrate.setTeacherid(param.getHandleid());
-            arbitrate.setMblockid(sq.getMblockid());
-            arbitrate.setTaskorder(checkedNum + 1);
+            Integer mpsbid = N_Utils.obj2Int(sq.get("mpsbid"));
+            arbitrate.setMpsbid(mpsbid);
+            arbitrate.setTaskorder(taskorder);
             arbitrate.setCheckstate(2);
             arbitrate.setCreatetime(N_Utils.getSecondTimestamp());
-            msPaperCheckTeacherArbitrateMapper.insertSelective(arbitrate);
+            msPaperCheckTeacherArbitrateMapper.save(arbitrate);
         }
         Map map = new HashMap();
         map.put("sq", sq);
@@ -126,9 +133,9 @@ public class MsPaperCheckTeacherArbitrateService {
      * @Param [param]
      * @Return void
      **/
+    @Transactional(rollbackFor = Exception.class)
     public void arbitrate(MsPaperCheckVo param) {
-        MsPaperCheck check = msPaperCheckMapper.findByMBlockId(param.getMpid(), param.getMblockid());
-        Integer correcttype = check.getCorrecttype();
+        Integer correcttype = param.getCorrecttype();
         Integer mpsbid = param.getMpsbid();
         Integer handleid = param.getHandleid();
         Double qscore = param.getQscore();
@@ -136,13 +143,6 @@ public class MsPaperCheckTeacherArbitrateService {
         Integer finalreason = param.getFinalreason();
         Integer hasgood = param.getHasgood();
         Integer hasbad = param.getHasbad();
-        Integer hasproblem = param.getHasproblem();
-        Integer problemtype = param.getProblemtype();
-        String problemcomm = param.getProblemcomm();
-        Integer probleid = null;
-        if (hasproblem.equals(1)) {
-            probleid = handleid;
-        }
         if (correcttype.equals(3)) {//按题块批阅
             MsPaperStudentBlock block = msPaperStudentBlockMapper.selectByPrimaryKey(mpsbid);
             String firstccores = block.getFirstccores();
@@ -216,15 +216,11 @@ public class MsPaperCheckTeacherArbitrateService {
             psq.setArbitrateid(handleid);
             psq.setArbitratetime(N_Utils.getSecondTimestamp());
             psq.setArbitratescore(arbitratescore);
-            psq.setArbitratestate(2);
+            psq.setArbitratestate(3);
             psq.setHasfinal(1);
             psq.setFinalreason(finalreason);
             psq.setHasgood(hasgood);
             psq.setHasbad(hasbad);
-            psq.setHasproblem(hasproblem);
-            psq.setProblemtype(problemtype);
-            psq.setProblemcomm(problemcomm);
-            psq.setProbleid(probleid);
             msPaperStudentBlockMapper.updateByPrimaryKeySelective(psq);
             msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, psq);
         } else if (correcttype.equals(2)) {
@@ -255,17 +251,14 @@ public class MsPaperCheckTeacherArbitrateService {
             psq.setArbitratetime(N_Utils.getSecondTimestamp());
             psq.setArbitratescore(arbitratescore);
             psq.setStuscore(finalScore);
-            psq.setArbitratestate(2);
+            psq.setArbitratestate(3);
             psq.setHasfinal(1);
             psq.setFinalreason(finalreason);
             psq.setHasgood(hasgood);
             psq.setHasbad(hasbad);
-            psq.setHasproblem(hasproblem);
-            psq.setProblemtype(problemtype);
-            psq.setProblemcomm(problemcomm);
-            psq.setProbleid(probleid);
             msPaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
         }
+        msPaperCheckTeacherArbitrateMapper.correct(param);
     }
 
     /**
@@ -275,10 +268,11 @@ public class MsPaperCheckTeacherArbitrateService {
      * @Param [mpid, handleid]
      * @Return java.util.List<java.util.Map>
      **/
-    public List<Map> listPendingArbitrate(Integer mpid, Integer handleid) {
+    public List<Map> listPendingArbitrate(Integer mpid, Integer handleid, Integer usertype) {
         MsCheckParam param = new MsCheckParam();
         param.setMpid(mpid);
         param.setHandleid(handleid);
+        param.setUsertype(usertype);
         Integer correctType = msPaperMapper.getCorrectTypeByMpId(param.getMpid());
         if (correctType.equals(3)) {
             return msPaperCheckTeacherArbitrateMapper.listBlockArbitrate(param);//学科组长-待仲裁题块列表
@@ -294,35 +288,37 @@ public class MsPaperCheckTeacherArbitrateService {
      * @Param [param]
      * @Return com.xhkjedu.vo.ResultVo
      **/
+    @Transactional(rollbackFor = Exception.class)
     public ResultVo getCorrectLeaderArbitrate(MsCheckParam param) {
-        MsPaper paper = msPaperMapper.selectByPrimaryKey(param.getMpid());
+        Integer mpid = param.getMpid();
+        MsPaper paper = msPaperMapper.selectByPrimaryKey(mpid);
         Integer correcttype = paper.getCorrecttype();
         if (!N_Utils.isTrueInteger(correcttype)) {
             throw new ServiceException("该试卷未设置批阅方式");
         }
         param.setCorrecttype(correcttype);
         param.setSubjectid(paper.getSubjectid());
-        MsPaperCheckVo sq = msPaperCheckTeacherArbitrateMapper.getCorrectLeaderArbitrate(param);
+        Map sq = msPaperCheckTeacherArbitrateMapper.getCorrectLeaderArbitrate(param);
 
         Integer totalNum = 0;
         Integer checkedNum = 0;
         if (sq != null) {
-            sq.setCorrecttype(correcttype);
-            param.setMblockid(sq.getMblockid());
+            Integer mblockid = N_Utils.obj2Int(sq.get("mblockid"));
+            param.setMblockid(mblockid);
             MsPaperCheckTeacher teacher = msPaperCheckTeacherArbitrateMapper.getACheckNum(param);
             totalNum = teacher.getTasknum();
             checkedNum = teacher.getCheckednum();
-            sq.setMpid(param.getMpid());
+            msPaperCheckTeacherArbitrateMapper.updateArbitrateState(param);
 
             //序号
             Integer taskorder = checkedNum + 1;
-            sq.setTaskorder(taskorder);
+            sq.put("taskorder", taskorder);
             MsPaperCheckTeacherArbitrate task = new MsPaperCheckTeacherArbitrate();
-            task.setMpid(sq.getMpid());
-            task.setMblockid(sq.getMblockid());
+            task.setMpid(mpid);
+            task.setMblockid(mblockid);
             task.setTeacherid(param.getHandleid());
             task.setTaskorder(taskorder);
-            task.setMpsbid(sq.getMpsbid());
+            task.setMpsbid(N_Utils.obj2Int(sq.get("mpsbid")));
             task.setCheckstate(2);
             task.setCreatetime(N_Utils.getSecondTimestamp());
             msPaperCheckTeacherArbitrateMapper.save(task);

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

@@ -62,6 +62,7 @@ public class MsPaperCheckTeacherProblemService {
      * @Param [param]
      * @Return com.xhkjedu.vo.ResultVo
      **/
+    @Transactional(rollbackFor = Exception.class)
     public ResultVo getCorrectProblem(MsCheckParam param) {
         Integer mpid = param.getMpid();
         MsPaper paper = msPaperMapper.selectByPrimaryKey(mpid);
@@ -83,6 +84,7 @@ public class MsPaperCheckTeacherProblemService {
             totalNum = teacher.getTasknum();
             checkedNum = teacher.getCheckednum();
             sq.put("mpid", mpid);
+            msPaperCheckTeacherProblemMapper.updateHasProblem(param);
 
             //序号
             Integer taskorder = checkedNum + 1;
@@ -112,6 +114,7 @@ public class MsPaperCheckTeacherProblemService {
      * @Param [param]
      * @Return void
      **/
+    @Transactional(rollbackFor = Exception.class)
     public void correct(MsPaperCheckVo param) {
         Integer correcttype = msPaperMapper.getCorrectTypeByMpId(param.getMpid());
         Integer mpsbid = param.getMpsbid();
@@ -175,6 +178,7 @@ public class MsPaperCheckTeacherProblemService {
             psq.setProblehid(handleid);
             msPaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
         }
+        msPaperCheckTeacherProblemMapper.correct(param);
     }
 
     /**

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

@@ -13,12 +13,12 @@ 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;
-import com.xhkjedu.smarking.vo.papercheck.MsCheckParam;
-import com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo;
+import com.xhkjedu.smarking.vo.papercheck.*;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -176,6 +176,7 @@ public class MsPaperCheckTeacherTaskService {
      * @Param [param]
      * @Return java.util.Map
      **/
+    @Transactional(rollbackFor = Exception.class)
     public ResultVo getCorrectBlock(MsCheckParam param) {
         Integer correcttype = msPaperMapper.getCorrectTypeByMpId(param.getMpid());
         if (!N_Utils.isTrueInteger(correcttype)) {
@@ -365,6 +366,7 @@ public class MsPaperCheckTeacherTaskService {
      * @Param [param]
      * @Return void
      **/
+    @Transactional(rollbackFor = Exception.class)
     public void correct(MsPaperCheckVo param) {
         MsPaperCheck check = msPaperCheckMapper.findByMBlockId(param.getMpid(), param.getMblockid());
         if (check == null) {
@@ -390,7 +392,7 @@ public class MsPaperCheckTeacherTaskService {
         Double qscore = param.getQscore();
         List<MsPaperBlockQuestion> questions = param.getQuestions();
         int checked = 2;
-        Double firstccore = param.getFirstccore();
+        Double arbitratescore = param.getArbitratescore();
         String checkscore;
         //仲裁状态0默认1待仲裁2已仲裁
         Integer arbitratestate = null;
@@ -405,7 +407,7 @@ public class MsPaperCheckTeacherTaskService {
                 block.setMpsbid(mpsbid);
                 block.setChecked(checked);
                 block.setFirstcime(N_Utils.getSecondTimestamp());
-                block.setFirstccore(firstccore);
+                block.setFirstccore(arbitratescore);
                 block.setHasgood(hasgood);
                 block.setHasbad(hasbad);
                 block.setHasproblem(hasproblem);
@@ -449,31 +451,36 @@ public class MsPaperCheckTeacherTaskService {
                 }
                 msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, block);//更新学生单题批阅信息
             } else {//按试题批阅
-                checkscore = firstccore.toString();
+                checkscore = arbitratescore.toString();
                 MsPaperStudentQuestion question = new MsPaperStudentQuestion();
                 question.setMpsqid(mpsbid);
                 question.setChecked(checked);
                 question.setFirstcime(N_Utils.getSecondTimestamp());
-                question.setFirstccore(firstccore);
+                question.setFirstccore(arbitratescore);
                 question.setHasgood(hasgood);
                 question.setHasbad(hasbad);
                 question.setHasproblem(hasproblem);
                 question.setProblemtype(problemtype);
                 question.setProblemcomm(problemcomm);
                 question.setProbleid(probleid);
-                question.setStuscore(firstccore);
+                question.setStuscore(arbitratescore);
                 msPaperStudentQuestionMapper.updateByPrimaryKeySelective(question);
             }
         } else {//双评
-            Integer firstcid = param.getFirstcid();
-            Integer secondcid = param.getSecondcid();
-            Integer firstcime = param.getFirstcime();
-            Integer secondcime = param.getSecondctime();
-            Double secondcscore = param.getSecondcscore();
+            MsCheckVo result = msPaperCheckTeacherTaskMapper.getCheckResult(param);
+            Integer firstcime = result.getFirstcime();
+            Integer secondcime = result.getSecondctime();
+            Double firstccore = result.getFirstccore();
+            Double secondcscore = result.getSecondcscore();
             Integer type = param.getChecktype();//批阅情况1一评2二评
+            if (type.equals(1)) {
+                firstccore = arbitratescore;
+            } else {
+                secondcscore = arbitratescore;
+            }
             boolean corrected = false;
-            if ((handleid.equals(firstcid) && N_Utils.isTrueInteger(secondcime))
-                    || (handleid.equals(secondcid) && N_Utils.isTrueInteger(firstcime))) {
+            if ((type.equals(1) && N_Utils.isTrueInteger(secondcime))
+                    || (type.equals(2) && N_Utils.isTrueInteger(firstcime))) {
                 checked = 3;
                 corrected = true;
             }
@@ -500,20 +507,16 @@ public class MsPaperCheckTeacherTaskService {
                 MsPaperStudentBlock block = new MsPaperStudentBlock();
                 block.setMpsbid(mpsbid);
                 String stuscores = questions.stream().map(MsPaperBlockQuestion::getMergescore).collect(Collectors.joining(";"));
+                String[] cores;
                 if (type.equals(1)) {
                     block.setFirstcime(N_Utils.getSecondTimestamp());
-                    block.setFirstccore(firstccore);
+                    block.setFirstccore(arbitratescore);
                     block.setFirstccores(stuscores);
+                    cores = param.getSecondcscores().split(";");
                 } else {
                     block.setSecondctime(N_Utils.getSecondTimestamp());
-                    block.setSecondcscore(secondcscore);
+                    block.setSecondcscore(arbitratescore);
                     block.setSecondcscores(stuscores);
-                }
-
-                String[] cores;
-                if (type.equals(1)) {
-                    cores = param.getSecondcscores().split(";");
-                } else {
                     cores = param.getFirstccores().split(";");
                 }
                 List<MsPaperStudentQuestion> studentQuestions = new ArrayList<>();
@@ -606,14 +609,13 @@ public class MsPaperCheckTeacherTaskService {
             } else {//按试题批阅
                 MsPaperStudentQuestion question = new MsPaperStudentQuestion();
                 question.setChecked(checked);
+                checkscore = arbitratescore.toString();
                 if (type.equals(1)) {
                     question.setFirstcime(N_Utils.getSecondTimestamp());
-                    question.setFirstccore(firstccore);
-                    checkscore = firstccore.toString();
+                    question.setFirstccore(arbitratescore);
                 } else {
                     question.setSecondctime(N_Utils.getSecondTimestamp());
-                    question.setSecondcscore(secondcscore);
-                    checkscore = secondcscore.toString();
+                    question.setSecondcscore(arbitratescore);
                 }
                 question.setHasgood(hasgood);
                 question.setHasbad(hasbad);

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

@@ -0,0 +1,28 @@
+package com.xhkjedu.smarking.vo.papercheck;
+
+import lombok.Data;
+
+/**
+ * @Description 批阅结果VO
+ * @Author YWX
+ * @Date 2024/11/22 16:12
+ **/
+@Data
+public class MsCheckVo {
+    //单评批改人
+    private Integer firstcid;
+    //单评批改时间
+    private Integer firstcime;
+    //单评批改分值
+    private Double firstccore;
+    //单评批改分值数组
+    private String firstccores;
+    //复评批改人
+    private Integer secondcid;
+    //复评批改时间
+    private Integer secondctime;
+    //复评批改分值
+    private Double secondcscore;
+    //复评批改分值数组
+    private String secondcscores;
+}

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

@@ -4,13 +4,38 @@
     <!--保存或更新单个任务-->
     <insert id="save">
         insert into ms_paper_check_teacher_arbitrate (mpid, mblockid, teacherid, taskorder,checkstate, mpsbid, createtime)
-        values (#{m.mpid},#{m.mblockid},#{m.teacherid},#{m.taskorder},#{m.mpsbid},#{m.checkstate},#{m.createtime})
+        values (#{m.mpid},#{m.mblockid},#{m.teacherid},#{m.taskorder},#{m.checkstate},#{m.mpsbid},#{m.createtime})
         on duplicate key update taskorder=#{m.taskorder},teacherid=#{m.teacherid}
     </insert>
+    <!--更新仲裁结果-->
+    <update id="correct">
+        update ms_paper_check_teacher_arbitrate
+        set checkstate=3,checkscore=#{param.arbitratescore}
+        <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>
+        where mpid=#{param.mpid} and mpsbid=#{param.mpsbid} and teacherid=#{param.handleid}
+    </update>
+    <!--更新仲裁状态-->
+    <update id="updateArbitrateState">
+        <if test="param.correcttype==3">
+            update ms_paper_student_block pb inner join ms_paper_student_question psq on pb.mpsbid=psq.mpsbid
+            set pb.arbitrateid=#{param.handleid},pb.arbitratestate=2,psq.arbitrateid=#{param.handleid},psq.arbitratestate=2
+            where pb.mpsbid=#{param.mpsbid}
+        </if>
+        <if test="param.correcttype==2">
+            update ms_paper_student_question psq
+            set psq.arbitrateid=#{param.handleid},psq.arbitratestate=2
+            where psq.mpsqid=#{param.mpsbid}
+        </if>
+    </update>
     <!--教师阅卷-待/已仲裁列表-->
     <select id="listArbitrate" resultType="java.util.Map">
-        select s.msid,s.subjectname,s.sdate,s.begintime,s.endtime,e.examname,e.gradeid,e.examtype
-        ,pc.mpid,pc.checktype,pc.dispenseway,pc.numtype
+        select s.msid,s.subjectname,s.sdate,s.begintime,s.endtime,e.examname,e.gradeid,e.examtype,e.exammode
+        ,pc.mpid,pc.checktype,pc.dispenseway,pc.numtype,pc.correcttype
         ,truncate((count(distinct if(psb.arbitratestate=2,psb.mpsbid,null)))*100/count(distinct psb.mpsbid),2) as checkrate
         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
@@ -20,8 +45,8 @@
         <if test="param.checktype==0">having 100>checkrate</if>
         <if test="param.checktype==1">having 100=checkrate</if>
         union
-        select s.msid,s.subjectname,s.sdate,s.begintime,s.endtime,e.examname,e.gradeid,e.examtype
-        ,pc.mpid,pc.checktype,pc.dispenseway,pc.numtype
+        select s.msid,s.subjectname,s.sdate,s.begintime,s.endtime,e.examname,e.gradeid,e.examtype,e.exammode
+        ,pc.mpid,pc.checktype,pc.dispenseway,pc.numtype,pc.correcttype
         ,truncate((count(distinct if(psb.arbitratestate=2,psb.mpsqid,null)))*100/count(distinct psb.mpsqid),2) as checkrate
         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
@@ -40,6 +65,7 @@
             ,count(distinct psb.mpsbid) as totalNum
             ,count(distinct if(psb.arbitratestate=2,psb.mpsbid,null)) as myCheckedNum
             ,count(distinct if(psb.arbitratestate=1,psb.mpsbid,null)) as myUncheckedNum
+            ,(select group_concat(pbbq.bqn separator '、') from ms_paper_block_question pbbq where pbbq.mblockid = pb.mblockid) as bqn
             from ms_paper_check pc left join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid
             inner join ms_paper_block pb on pc.mblockid = pb.mblockid and pb.mpid = pc.mpid
             where pc.mpid=#{param.mpid} and pc.arbitrateid=#{param.handleid} and psb.arbitratestate!=0
@@ -60,17 +86,17 @@
         </if>
     </select>
     <!--获取待仲裁任务-->
-    <select id="getCorrectArbitrate" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
+    <select id="getCorrectArbitrate" resultType="java.util.Map">
         <if test="param.correcttype==3">
-            select pc.mblockid,pc.correcttype,psb.stuanswer,psb.mpsbid
+            select pc.mpid,pc.mblockid,pc.correcttype,psb.stuanswer,psb.mpsbid,psb.arbitratescore,2 as answertype
             from ms_paper_check pc inner join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid
             where pc.mpid=#{param.mpid} and pc.arbitrateid=#{param.handleid}
             and (psb.arbitratestate=1 or (psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid}))
             order by psb.mpsbid limit 1
         </if>
         <if test="param.correcttype==2">
-            select pc.mblockid,pc.correcttype,psb.stuanswer,psb.mpsqid as mpsbid,psb.answertype
-            from ms_paper_check pc inner join ms_paper_student_question psb on psb.mblockid = pc.mptqid and psb.mpid = pc.mpid
+            select pc.mpid,pc.mblockid,pc.correcttype,psb.stuanswer,psb.mpsqid as mpsbid,psb.arbitratescore,psb.answertype
+            from ms_paper_check pc inner join ms_paper_student_question psb on psb.mptqid = pc.mblockid and psb.mpid = pc.mpid
             where pc.mpid=#{param.mpid} and pc.arbitrateid=#{param.handleid}
             and (psb.arbitratestate=1 or (psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid}))
             order by psb.mpsqid limit 1
@@ -94,18 +120,18 @@
     <!--教师阅卷-待仲裁-上一份-->
     <select id="getPreArbitrate" resultType="java.util.Map">
         <if test="param.correcttype==3">
-            select psb.mblockid,#{param.correcttype} as correcttype,psb.stuanswer,psb.mpsbid,psb.arbitratescore
-            from ms_paper_student_block psb
-            where psb.mpid=#{param.mpid} and psb.arbitrateid=#{param.handleid} and psb.mblockid=#{param.mblockid}
-            and psb.arbitratestate=3 and #{param.mpsbid}>psb.mpsbid
-            order by psb.mpsbid desc limit 1
+            select pcta.mpid,pcta.mblockid,#{param.correcttype} as correcttype,pcta.taskorder,psb.stuanswer,psb.mpsbid,psb.arbitratescore,2 as answertype
+            from ms_paper_student_block psb inner join ms_paper_check_teacher_arbitrate pcta on pcta.mpid=psb.mpid and pcta.mpsbid=psb.mpsbid
+            where pcta.mpid=#{param.mpid} and pcta.teacherid=#{param.handleid} and pcta.mblockid=#{param.mblockid}
+            and pcta.checkstate=3 and #{param.taskorder}>pcta.taskorder
+            order by pcta.taskorder desc limit 1
         </if>
         <if test="param.correcttype==2">
-            select psb.mptqid as mblockid,#{param.correcttype} as correcttype,psb.stuanswer,psb.mpsqid as mpsbid,psb.arbitratescore,psb.answertype
-            from ms_paper_student_question psb
-            where psb.mpid=#{param.mpid} and psb.arbitrateid=#{param.handleid} and psb.mptqid=#{param.mblockid}
-            and psb.arbitratestate=3 and #{param.mpsqid}>psb.mpsqid
-            order by psb.mpsqid desc limit 1
+            select pcta.mpid,pcta.mblockid,#{param.correcttype} as correcttype,pcta.taskorder,psb.stuanswer,pcta.mpsbid,psb.arbitratescore,psb.answertype
+            from ms_paper_student_question psb inner join ms_paper_check_teacher_arbitrate pcta on pcta.mpid=psb.mpid and pcta.mpsbid=psb.mpsqid
+            where pcta.mpid=#{param.mpid} and pcta.teacherid=#{param.handleid} and pcta.mblockid=#{param.mblockid}
+            and pcta.checkstate=3 and #{param.taskorder}>pcta.taskorder
+            order by pcta.taskorder desc limit 1
         </if>
     </select>
     <!--待仲裁题块列表-->
@@ -128,8 +154,8 @@
         ,pc.mblockid,pc.hidefirstscore
         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
-        where pc.mpid=#{param.mpid} and psb.arbitratestate=1
-        <if test="param.handleid!=null and param.handleid!=0">
+        where pc.mpid=#{param.mpid} and (psb.arbitratestate=1 or psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid})
+        <if test="param.usertype!=null and param.usertype==1">
             and pc.arbitrateid=#{param.handleid}
         </if>
         group by pb.mblockid
@@ -140,23 +166,23 @@
         select psb.qorder,psb.qn,psb.qscore
         ,pc.mblockid,pc.hidefirstscore
         from ms_paper_check pc left join ms_paper_student_question psb on psb.mptqid = pc.mblockid and psb.mpid = pc.mpid
-        where pc.mpid=#{param.mpid} and psb.arbitratestate=1
-        <if test="param.handleid!=null and param.handleid!=0">
+        where pc.mpid=#{param.mpid} and (psb.arbitratestate=1 or psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid})
+        <if test="param.usertype!=null and param.usertype==1">
             and pc.arbitrateid=#{param.handleid}
         </if>
         group by psb.mptqid
         order by psb.mptqid
     </select>
     <!--学科组长-获取待仲裁任务-->
-    <select id="getCorrectLeaderArbitrate" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
+    <select id="getCorrectLeaderArbitrate" resultType="java.util.Map">
         <if test="param.correcttype==3">
-            select psb.mblockid,psb.stuanswer,psb.mpsbid
+            select psb.mpid,psb.mblockid,#{param.correcttype} as correcttype,psb.stuanswer,psb.mpsbid,psb.arbitratescore,2 as answertype
             from ms_paper_student_block psb
             where psb.mpid=#{param.mpid} and (psb.arbitratestate=1 or (psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid}))
             order by psb.mpsbid limit 1
         </if>
         <if test="param.correcttype==2">
-            select psb.mpsqid as mblockid,psb.stuanswer,psb.mpsqid as mpsbid,psb.answertype
+            select psb.mpid,psb.mpsqid as mblockid,#{param.correcttype} as correcttype,psb.stuanswer,psb.mpsqid as mpsbid,psb.arbitratescore,psb.answertype
             from ms_paper_student_question psb
             where psb.mpid=#{param.mpid} and (psb.arbitratestate=1 or (psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid}))
             order by psb.mpsqid limit 1
@@ -175,16 +201,16 @@
     </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
+        select pcta.mpid,pcta.mblockid,#{param.correcttype} as correcttype,pcta.taskorder,psq.stuanswer,pcta.mpsbid,psq.arbitratescore
+        ,if(#{param.correcttype}=3,2,psq.answertype) as answertype
+        from ms_paper_check_teacher_arbitrate pcta
         <if test="param.correcttype==3">
-            inner join ms_paper_student_block psq on mpcta.mpsbid=psq.mpsbid
+            inner join ms_paper_student_block psq on pcta.mpsbid=psq.mpsbid
         </if>
         <if test="param.correcttype==2">
-            inner join ms_paper_student_question psq on mpcta.mpsbid=psq.mpsqid
+            inner join ms_paper_student_question psq on pcta.mpsbid=psq.mpsqid
         </if>
-        where mpcta.mpctaid=#{param.mpctaid}
+        where pcta.mpctaid=#{param.mpctaid}
     </select>
     <!--初评分-->
     <select id="getScore" resultType="java.util.Map">

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

@@ -4,9 +4,34 @@
     <!--保存或更新单个任务-->
     <insert id="save">
         insert into ms_paper_check_teacher_problem (mpid, mblockid, teacherid, taskorder,checkstate, mpsbid, createtime)
-        values (#{m.mpid},#{m.mblockid},#{m.teacherid},#{m.taskorder},#{m.mpsbid},#{m.checkstate},#{m.createtime})
+        values (#{m.mpid},#{m.mblockid},#{m.teacherid},#{m.taskorder},#{m.checkstate},#{m.mpsbid},#{m.createtime})
         on duplicate key update taskorder=#{m.taskorder},teacherid=#{m.teacherid}
     </insert>
+    <!--更新疑难卷状态-->
+    <update id="updateHasProblem">
+        <if test="param.correcttype==3">
+            update ms_paper_student_block pb inner join ms_paper_student_question psq on pb.mpsbid=psq.mpsbid
+            set pb.problehid=#{param.handleid},pb.hasproblem=2,psq.problehid=#{param.handleid},psq.hasproblem=2
+            where pb.mpsbid=#{param.mpsbid}
+        </if>
+        <if test="param.correcttype==2">
+            update ms_paper_student_question psq
+            set psq.problehid=#{param.handleid},psq.hasproblem=2
+            where psq.mpsqid=#{param.mpsbid}
+        </if>
+    </update>
+    <!--处理疑难卷-->
+    <update id="correct">
+        update ms_paper_check_teacher_problem
+        set checkstate=3,checkscore=#{param.arbitratescore}
+        <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>
+        where mpid=#{param.mpid} and mpsbid=#{param.mpsbid} and teacherid=#{param.handleid}
+    </update>
     <!--删除单个任务-->
     <delete id="deleteByMpsbidAndMpid">
         delete from ms_paper_check_teacher_problem where mpsbid=#{mpsbid} and mpid=#{mpid}
@@ -29,32 +54,42 @@
     <select id="listBlockProblem" resultMap="arbitrateBlockResultMap">
         select pb.mblockid,pb.blockname,pb.blockorder,pb.bqnum
         from ms_paper_student_block psb inner join ms_paper_block pb on psb.mblockid = pb.mblockid
-        where psb.mpid=#{param.mpid} and psb.hasproblem=1
+        where psb.mpid=#{param.mpid} and (psb.hasproblem=1 or (psb.hasproblem=2 and psb.problehid=#{param.handleid}))
         group by pb.mblockid
         order by pb.blockorder
     </select>
     <!--疑难卷试题列表-->
     <select id="listQuestionProblem" resultType="java.util.Map">
-        select psb.qorder,psb.qn,psb.qscore
+        select psb.mptqid as mblockid,psb.qorder,psb.qn,psb.qscore
         from ms_paper_student_question psb
-        where psb.mpid=#{param.mpid} and psb.hasproblem=1
+        where psb.mpid=#{param.mpid} and (psb.hasproblem=1 or (psb.hasproblem=2 and psb.problehid=#{param.handleid}))
         group by psb.mptqid
         order by psb.mptqid
     </select>
     <!--获取疑难卷任务-->
-    <select id="getCorrectLeaderProblem" resultType="java.util.Map">
+    <select id="getCorrectProblem" resultType="java.util.Map">
+        select psb.stuanswer,psb.hasproblem,psb.problemtype,psb.problemcomm
+        <if test="param.correcttype==3">
+            ,psb.mblockid,psb.mpsbid,2 as answertype
+        </if>
+        <if test="param.correcttype!=3">
+            ,psb.mptqid as mblockid,psb.mpsqid as mpsbid,psb.answertype
+        </if>
+        ,u.username as studentname,u.examno,u2.username as teachername
         <if test="param.correcttype==3">
-            select psb.mblockid,psb.stuanswer,psb.mpsbid
             from ms_paper_student_block psb
-            where psb.mpid=#{param.mpid}
-            and (psb.hasproblem=1 or (psb.hasproblem=2 and psb.problehid=#{param.handleid}))
+        </if>
+        <if test="param.correcttype!=3">
+            from ms_paper_student_question psb
+        </if>
+        inner join t_user u on psb.studentid = u.userid
+        inner join t_user u2 on psb.probleid = u2.userid
+        where psb.mpid=#{param.mpid}
+        and (psb.hasproblem=1 or (psb.hasproblem=2 and psb.problehid=#{param.handleid}))
+        <if test="param.correcttype==3">
             order by psb.mpsbid limit 1
         </if>
         <if test="param.correcttype==2">
-            select psb.mpsqid as mblockid,psb.stuanswer,psb.mpsqid as mpsbid,psb.answertype
-            from ms_paper_student_question psb
-            where psb.mpid=#{param.mpid}
-            and (psb.hasproblem=1 or (psb.hasproblem=2 and psb.problehid=#{param.handleid}))
             order by psb.mpsqid limit 1
         </if>
     </select>
@@ -77,6 +112,7 @@
     <select id="getPreProblem" resultType="java.util.Map">
         select psq.stuanswer,psq.hasproblem,psq.problemtype,psq.problemcomm
         ,pctp.mpid,pctp.mblockid,pctp.mpsbid,pctp.taskorder,pctp.checkscore
+        ,if(#{param.correcttype}=3,2,psq.answertype) as answertype
         ,u.username as studentname,u.examno,u2.username as teachername
         from ms_paper_check_teacher_problem pctp
         <if test="param.correcttype==3">
@@ -88,8 +124,8 @@
         inner join t_user u on psq.studentid = u.userid
         inner join t_user u2 on psq.probleid = u2.userid
         where pctp.mpid=#{param.mpid} and pctp.teacherid=#{param.handleid} and pctp.mblockid=#{param.mblockid} and pctp.checkstate=3
-        and #{param.mpsbid}>pctp.mpsbid
-        order by pctp.mpsbid desc limit 1
+        and #{param.taskorder}>pctp.taskorder
+        order by pctp.taskorder desc limit 1
     </select>
     <!--历史记录列表-->
     <select id="listHistory" resultType="java.util.Map">
@@ -106,6 +142,7 @@
     <select id="detailHistory" resultType="java.util.Map">
         select psq.stuanswer,psq.hasproblem,psq.problemtype,psq.problemcomm
         ,pctp.mpid,pctp.mblockid,pctp.mpsbid,pctp.taskorder,pctp.checkscore
+        ,if(#{param.correcttype}=3,2,psq.answertype) as answertype
         ,u.username as studentname,u.examno,u2.username as teachername
         from ms_paper_check_teacher_problem pctp
         <if test="param.correcttype==3">

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

@@ -371,30 +371,30 @@
     <!--教师阅卷-按题块-获取待批试题-->
     <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,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
+            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            ,2 as answertype
+            ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid
+            from ms_paper_student_block psq inner join ms_paper_check_teacher_task pctt on psq.mpsbid = pctt.mpsbid and psq.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
-            and pctt.checkstate!=3 and psb.hasproblem=0
+            and pctt.checkstate!=3 and psq.hasproblem=0
             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,psb.studentid
-            ,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.firstcime is null)
+            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            ,2 as answertype
+            ,psq.mblockid,psq.mpsbid
+            from ms_paper_student_block psq
+            where psq.mpid=#{param.mpid} and psq.mblockid = #{param.mblockid}
+            and (psq.checked=1 or (psq.checked=2 and ((psq.firstcid=#{param.teacherid} and psq.firstcime is null)
             <if test="param.checktype==2">
-                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)
+                or (psq.secondcid=#{param.teacherid} and psq.secondctime is null)
+                or (psq.firstcid!=#{param.teacherid} and psq.secondcid is null)
+                or (psq.secondcid!=#{param.teacherid} and psq.firstcid is null)
             </if>
             )))
-            and psb.hasproblem=0
-            order by field(psb.checked,2,1,3)
+            and psq.hasproblem=0
+            order by field(psq.checked,2,1,3)
             limit 1
         </if>
     </select>
@@ -502,30 +502,30 @@
     <!--教师阅卷-按试题-获取待批试题-->
     <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,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
+            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            ,psq.answertype
+            ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid
+            from ms_paper_student_question psq inner join ms_paper_check_teacher_task pctt on psq.mpsqid = pctt.mpsbid and psq.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
-            and pctt.checkstate!=3 and psb.hasproblem=0
+            and pctt.checkstate!=3 and psq.hasproblem=0
             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
-            ,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.firstcime is null)
+            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            ,psq.answertype
+            ,psq.mptqid as mblockid,psq.mpsqid as mpsbid,psq.mptqid
+            from ms_paper_student_question psq
+            where psq.mpid=#{param.mpid} and psq.mptqid = #{param.mblockid}
+            and (psq.checked=1 or (psq.checked=2 and ((psq.firstcid=#{param.teacherid} and psq.firstcime is null)
             <if test="param.checktype==2">
-                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)
+                or (psq.secondcid=#{param.teacherid} and psq.secondctime is null)
+                or (psq.firstcid!=#{param.teacherid} and psq.secondcid is null)
+                or (psq.secondcid!=#{param.teacherid} and psq.firstcid is null)
             </if>
             )))
-            and psb.hasproblem=0
-            order by field(psb.checked,2,1,3)
+            and psq.hasproblem=0
+            order by field(psq.checked,2,1,3)
             limit 1
         </if>
     </select>
@@ -542,30 +542,31 @@
     <!--教师阅卷-按班级-获取待批试题-->
     <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,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
+            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            ,psq.answertype
+            ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid
+            from ms_paper_student_question psq inner join ms_paper_check_teacher_task pctt on psq.mpsqid = pctt.mpsbid and psq.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
-            and pctt.checkstate!=3 and psb.hasproblem=0
+            and pctt.checkstate!=3 and psq.hasproblem=0
             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
-            ,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.firstcime is null)
+            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            ,psq.answertype
+            ,c.classid as mblockid,psq.mpsqid as mpsbid,psq.mptqid
+            from ms_paper_student_question psq inner join ms_class c on c.examid=psq.examid and c.subjectid=psq.subjectid
+            inner join ms_class_student cs on cs.examid=psq.examid and cs.subjectid=psq.subjectid and cs.studentid=psq.studentid
+            where psq.mpid=#{param.mpid} and c.classid = #{param.mblockid}
+            and (psq.checked=1 or (psq.checked=2 and ((psq.firstcid=#{param.teacherid} and psq.firstcime is null)
             <if test="param.checktype==2">
-                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)
+                or (psq.secondcid=#{param.teacherid} and psq.secondctime is null)
+                or (psq.firstcid!=#{param.teacherid} and psq.secondcid is null)
+                or (psq.secondcid!=#{param.teacherid} and psq.firstcid is null)
             </if>
             )))
-            and psb.hasproblem=0
-            order by field(psb.checked,2,1,3),psb.mptqid
+            and psq.hasproblem=0
+            order by field(psq.checked,2,1,3),psq.mptqid
             limit 1
         </if>
     </select>
@@ -600,13 +601,14 @@
     </select>
     <!--教师阅卷-上一份-->
     <select id="getPreCorrect" resultType="java.util.Map">
-        select psq.stuanswer
+        select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
         <if test="param.correcttype==3">
-             ,if(pctt.checktype=1,psq.firstccores,psq.secondcscores) as stuscore
+            ,2 as answertype
         </if>
         <if test="param.correcttype!=3">
-            ,if(pctt.checktype=1,psq.firstccore,psq.secondcscore) as stuscore
+            ,psq.answertype
         </if>
+        ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid,pctt.taskorder,pctt.checkscore,pctt.checktype
         from ms_paper_check_teacher_task pctt
         <if test="param.correcttype==3">
             inner join ms_paper_student_block psq on pctt.mpsbid=psq.mpsbid
@@ -638,8 +640,14 @@
     </select>
     <!--教师阅卷-历史详情-->
     <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
+        select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+        <if test="param.correcttype==3">
+             ,2 as answertype
+        </if>
+        <if test="param.correcttype!=3">
+            ,psq.answertype
+        </if>
+        ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid,pctt.taskorder,pctt.checkscore,pctt.checktype
         from ms_paper_check_teacher_task pctt
         <if test="param.correcttype==3">
             inner join ms_paper_student_block psq on pctt.mpsbid=psq.mpsbid
@@ -693,4 +701,16 @@
         from ms_paper_check pc
         where pc.checkstate=1 and pc.arbitrateid = #{param.handleid}) as a
     </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
+        <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
+            where psq.mpsqid=#{param.mpsbid}
+        </if>
+    </select>
 </mapper>