Merge remote-tracking branch 'origin/ywx' into wn

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

@@ -216,7 +216,7 @@ public class MsPaperCheckTeacherArbitrateController {
     public ResultVo detailHistory(@RequestBody MsCheckParam param) {
         N_Utils.validation(new Object[]{
                 param.getMpctaid(), "任务ID", 1
-                , param.getMpid(), "批阅设置", 1
+                , param.getCorrecttype(), "批阅设置", 1
         });
         return new ResultVo(0, "查询成功", msPaperCheckTeacherArbitrateService.detailHistory(param));
     }

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

@@ -0,0 +1,155 @@
+package com.xhkjedu.smarking.controller.papercheck;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.smarking.service.papercheck.MsPaperCheckTeacherProblemService;
+import com.xhkjedu.smarking.vo.papercheck.MsCheckParam;
+import com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 疑难卷教师任务表相关操作
+ * @Author auto
+ * @Date 2024-11-21
+ */
+@RestController
+@RequestMapping("/mproblem")
+public class MsPaperCheckTeacherProblemController {
+    @Resource
+    private MsPaperCheckTeacherProblemService msPaperCheckTeacherProblemService;
+
+    /**
+     * @Description 疑难卷列表
+     * @Date 2024/11/21 9:59
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_problem")
+    public ResultVo listProblem(@RequestBody MsCheckParam param) {
+        Integer mpid = param.getMpid();
+        N_Utils.validation(new Object[]{mpid, "试卷ID", 1});
+        List<Map> list = msPaperCheckTeacherProblemService.listPendingProblem(mpid);
+        return new ResultVo(0, "查询成功", list);
+    }
+
+    /**
+     * @Description 获取疑难卷任务
+     * @Date 2024/11/21 10:12
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/get_correct_problem")
+    public ResultVo getCorrectProblem(@RequestBody MsCheckParam param) {
+        N_Utils.validation(new Object[]{param.getHandleid(), "操作人ID", 1, param.getMpid(), "试卷ID", 1});
+        return msPaperCheckTeacherProblemService.getCorrectProblem(param);
+    }
+
+    /**
+     * @Description 处理疑难卷
+     * @Date 2024/11/21 11:17
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/correct")
+    public ResultVo correct(@RequestBody MsPaperCheckVo param) {
+        N_Utils.validation(new Object[]{
+                param.getHandleid(), "操作人ID", 1
+                , param.getMpid(), "试卷ID", 1
+                , param.getMblockid(), "题块ID", 1
+                , param.getMpsbid(), "任务ID", 1
+                , param.getQscore(), "试题分值", 2
+        });
+        param.setFinalreason(1);
+        msPaperCheckTeacherProblemService.correct(param);
+        return new ResultVo(0, "处理成功");
+    }
+
+    /**
+     * @Description 获取上一份疑难卷
+     * @Date 2024/11/21 14:35
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/get_pre_problem")
+    public ResultVo getPreProblem(@RequestBody MsCheckParam param) {
+        N_Utils.validation(new Object[]{
+                param.getHandleid(), "操作人ID", 1
+                , param.getMpid(), "试卷ID", 1
+                , param.getMblockid(), "题块ID", 1
+                , param.getCorrecttype(), "批阅设置", 1
+        });
+        return new ResultVo(0, "查询成功", msPaperCheckTeacherProblemService.getPreProblem(param));
+    }
+
+    /**
+     * @Description 历史记录列表
+     * @Date 2024/11/21 10:55
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_history")
+    public ResultVo listHistory(@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
+                , param.getCorrecttype(), "批阅设置", 1
+                , page, "显示页码", 1
+                , size, "显示条数", 1
+        });
+        PageHelper.startPage(page, size);
+        List<Map> list = msPaperCheckTeacherProblemService.listHistory(param);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "查询成功", pageResult);
+    }
+
+    /**
+     * @Description 历史记录详情
+     * @Date 2024/11/21 14:04
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/detail_history")
+    public ResultVo detailHistory(@RequestBody MsCheckParam param) {
+        N_Utils.validation(new Object[]{
+                param.getMpctpid(), "任务ID", 1
+                , param.getCorrecttype(), "批阅设置", 1
+        });
+        return new ResultVo(0, "查询成功", msPaperCheckTeacherProblemService.detailHistory(param));
+    }
+
+    /**
+     * @Description 打回重阅
+     * @Date 2024/11/21 15:19
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/back_correct")
+    public ResultVo backCorrect(@RequestBody MsPaperCheckVo param) {
+        N_Utils.validation(new Object[]{
+                param.getHandleid(), "操作人ID", 1
+                , param.getMpid(), "试卷ID", 1
+                , param.getMpsbid(), "任务ID", 1
+                , param.getCorrecttype(), "批阅设置", 1
+        });
+        msPaperCheckTeacherProblemService.backCorrect(param);
+        return new ResultVo(0, "打回成功");
+    }
+}

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

@@ -48,4 +48,7 @@ public interface MsPaperCheckTeacherArbitrateMapper extends TkMapper<MsPaperChec
 
     //初评分
     List<Map> getScore(@Param("param") MsCheckParam param);
+
+    //保存或更新单个任务
+    void save(@Param("m") MsPaperCheckTeacherArbitrate task);
 }

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

@@ -0,0 +1,48 @@
+package com.xhkjedu.smarking.mapper.papercheck;
+
+import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher;
+import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacherProblem;
+import com.xhkjedu.smarking.vo.papercheck.MsCheckParam;
+import com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 疑难卷教师任务表 Mapper 接口
+ * @Author auto
+ * @Date 2024-11-21
+ */
+public interface MsPaperCheckTeacherProblemMapper extends TkMapper<MsPaperCheckTeacherProblem> {
+    //疑难卷题块列表
+    List<Map> listBlockProblem(@Param("param") MsCheckParam param);
+
+    //疑难卷试题列表
+    List<Map> listQuestionProblem(@Param("param") MsCheckParam param);
+
+    //获取疑难卷任务
+    Map getCorrectProblem(@Param("param") MsCheckParam param);
+
+    //获取疑难卷数量
+    MsPaperCheckTeacher getPCheckNum(@Param("param") MsCheckParam param);
+
+    //获取上一份疑难卷
+    Map getPreProblem(@Param("param") MsCheckParam param);
+
+    //历史记录列表
+    List<Map> listHistory(@Param("param") MsCheckParam param);
+
+    //历史记录详情
+    Map detailHistory(@Param("param") MsCheckParam param);
+
+    //保存或更新单个任务
+    void save(@Param("m") MsPaperCheckTeacherProblem task);
+
+    //删除单个任务
+    void deleteByMpsbidAndMpid(@Param("mpsbid") Integer mpsbid,@Param("mpid") Integer mpid);
+
+    //打回重阅
+    void backCorrect(@Param("param") MsPaperCheckVo param);
+}

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

@@ -0,0 +1,40 @@
+package com.xhkjedu.smarking.model.papercheck;
+
+import com.xhkjedu.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @Description 疑难卷教师任务表
+ * @Author auto
+ * @Date 2024-11-21
+ */
+@Data
+@Table(name = "ms_paper_check_teacher_problem")
+public class MsPaperCheckTeacherProblem extends BaseBean {
+    @Id
+    //疑难卷教师任务ID
+    private Integer mpctpid;
+    //试卷ID
+    private Integer mpid;
+    //题块/试题/班级ID
+    private Integer mblockid;
+    //教师ID
+    private Integer teacherid;
+    //序号
+    private Integer taskorder;
+    //学生题块/试题ID
+    private Integer mpsbid;
+    //批阅状态1未批改2批改中3已批改
+    private Integer checkstate;
+    //得分数组
+    private String checkscore;
+    //创建时间
+    private Integer createtime;
+    //是否优秀试卷0默认1是
+    private Integer hasgood;
+    //是否违规试卷0默认1是
+    private Integer hasbad;
+}

smarking/src/main/java/com/xhkjedu/smarking/model/stupaper/MsPaperStudentBlock.java

@@ -65,12 +65,16 @@ public class MsPaperStudentBlock extends BaseBean {
     private Double arbitratescore;
     //仲裁状态0默认1待仲裁2仲裁中3已仲裁
     private Integer arbitratestate;
-    //疑难0默认1疑难
+    //疑难0默认1疑难2处理中3已处理
     private Integer hasproblem;
     //疑难类型1图形模糊2答题错位3没有图像4图像颠倒5其他问题
     private Integer problemtype;
     //疑难备注
     private String problemcomm;
+    //疑难卷标记人ID
+    private Integer probleid;
+    //疑难卷处理人ID
+    private Integer problehid;
     //是否最终批改结果0否1是
     private Integer hasfinal;
     //最终批改原因1仲裁2学科组长批

smarking/src/main/java/com/xhkjedu/smarking/model/stupaper/MsPaperStudentQuestion.java

@@ -88,12 +88,16 @@ public class MsPaperStudentQuestion extends BaseBean {
     private Double arbitratescore;
     //仲裁状态0默认1待仲裁2仲裁中3已仲裁
     private Integer arbitratestate;
-    //疑难0默认1疑难
+    //疑难0默认1疑难2处理中3已处理
     private Integer hasproblem;
     //疑难类型1图形模糊2答题错位3没有图像4图像颠倒5其他问题
     private Integer problemtype;
     //疑难备注
     private String problemcomm;
+    //疑难卷标记人ID
+    private Integer probleid;
+    //疑难卷处理人ID
+    private Integer problehid;
     //是否最终批改结果0否1是
     private Integer hasfinal;
     //最终批改原因1仲裁2学科组长批

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

@@ -134,6 +134,15 @@ public class MsPaperCheckTeacherArbitrateService {
         Double qscore = param.getQscore();
         Double arbitratescore = param.getArbitratescore();
         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();
@@ -210,6 +219,12 @@ public class MsPaperCheckTeacherArbitrateService {
             psq.setArbitratestate(2);
             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)) {
@@ -243,6 +258,12 @@ public class MsPaperCheckTeacherArbitrateService {
             psq.setArbitratestate(2);
             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);
         }
     }
@@ -292,6 +313,19 @@ public class MsPaperCheckTeacherArbitrateService {
             totalNum = teacher.getTasknum();
             checkedNum = teacher.getCheckednum();
             sq.setMpid(param.getMpid());
+
+            //序号
+            Integer taskorder = checkedNum + 1;
+            sq.setTaskorder(taskorder);
+            MsPaperCheckTeacherArbitrate task = new MsPaperCheckTeacherArbitrate();
+            task.setMpid(sq.getMpid());
+            task.setMblockid(sq.getMblockid());
+            task.setTeacherid(param.getHandleid());
+            task.setTaskorder(taskorder);
+            task.setMpsbid(sq.getMpsbid());
+            task.setCheckstate(2);
+            task.setCreatetime(N_Utils.getSecondTimestamp());
+            msPaperCheckTeacherArbitrateMapper.save(task);
         }
         Map map = new HashMap();
         map.put("sq", sq);

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

@@ -0,0 +1,225 @@
+package com.xhkjedu.smarking.service.papercheck;
+
+import com.xhkjedu.exception.ServiceException;
+import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
+import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherProblemMapper;
+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.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.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.*;
+
+/**
+ * @Description 疑难卷教师任务表 服务实现类
+ * @Author auto
+ * @Date 2024-11-21
+ */
+@Service
+public class MsPaperCheckTeacherProblemService {
+    @Resource
+    private MsPaperCheckTeacherProblemMapper msPaperCheckTeacherProblemMapper;
+    @Resource
+    private MsPaperMapper msPaperMapper;
+    @Resource
+    private MsPaperStudentBlockMapper msPaperStudentBlockMapper;
+    @Resource
+    private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
+
+    /**
+     * @Description 学科组长-疑难卷列表
+     * @Date 2024/11/21 10:01
+     * @Author YWX
+     * @Param [mpid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listPendingProblem(Integer mpid) {
+        MsCheckParam param = new MsCheckParam();
+        param.setMpid(mpid);
+        Integer correctType = msPaperMapper.getCorrectTypeByMpId(param.getMpid());
+        if (correctType.equals(3)) {
+            return msPaperCheckTeacherProblemMapper.listBlockProblem(param);//学科组长-待仲裁题块列表
+        } else {
+            return msPaperCheckTeacherProblemMapper.listQuestionProblem(param);//学科组长-待仲裁试题列表
+        }
+    }
+
+    /**
+     * @Description 获取疑难卷任务
+     * @Date 2024/11/21 10:19
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo getCorrectProblem(MsCheckParam param) {
+        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());
+        Map sq = msPaperCheckTeacherProblemMapper.getCorrectProblem(param);
+
+        Integer totalNum = 0;
+        Integer checkedNum = 0;
+        if (sq != null) {
+            sq.put("correcttype", correcttype);
+            Integer mblockid = N_Utils.obj2Int(sq.get("mblockid"));
+            param.setMblockid(mblockid);
+            MsPaperCheckTeacher teacher = msPaperCheckTeacherProblemMapper.getPCheckNum(param);
+            totalNum = teacher.getTasknum();
+            checkedNum = teacher.getCheckednum();
+            sq.put("mpid", mpid);
+
+            //序号
+            Integer taskorder = checkedNum + 1;
+            sq.put("taskorder", taskorder);
+            MsPaperCheckTeacherProblem task = new MsPaperCheckTeacherProblem();
+            task.setMpid(mpid);
+            task.setMblockid(mblockid);
+            task.setTeacherid(param.getHandleid());
+            task.setTaskorder(taskorder);
+            task.setMpsbid(N_Utils.obj2Int(sq.get("mpsbid")));
+            task.setCheckstate(2);
+            task.setCreatetime(N_Utils.getSecondTimestamp());
+            msPaperCheckTeacherProblemMapper.save(task);
+        }
+        Map map = new HashMap();
+        map.put("sq", sq);
+        map.put("totalNum", totalNum);
+        map.put("checkedNum", checkedNum);
+        String msg = "获取成功";
+        return new ResultVo(0, msg, map);
+    }
+
+    /**
+     * @Description 处理疑难卷
+     * @Date 2024/11/21 11:17
+     * @Author YWX
+     * @Param [param]
+     * @Return void
+     **/
+    public void correct(MsPaperCheckVo param) {
+        Integer correcttype = msPaperMapper.getCorrectTypeByMpId(param.getMpid());
+        Integer mpsbid = param.getMpsbid();
+        Integer handleid = param.getHandleid();
+        Double qscore = param.getQscore();
+        Double arbitratescore = param.getArbitratescore();
+        Integer hasgood = param.getHasgood();
+        Integer hasbad = param.getHasbad();
+        if (correcttype.equals(3)) {//按题块批阅
+            List<MsPaperBlockQuestion> questions = param.getQuestions();
+            List<MsPaperStudentQuestion> studentQuestions = new ArrayList<>();
+            for (MsPaperBlockQuestion question : questions) {
+                Double stuscore = question.getStuscore();
+                if (N_Utils.isTrueInteger(question.getMptqid())) {
+                    MsPaperStudentQuestion studentQuestion = new MsPaperStudentQuestion();
+                    studentQuestion.setMptqid(question.getMptqid());
+                    studentQuestion.setStuscore(stuscore);
+                    studentQuestions.add(studentQuestion);
+                } else {
+                    String[] mptqids = question.getMergeqid().split(",");
+                    String[] mergestuscore = question.getMergestuscore().split(",");
+                    double[] scores = new double[mergestuscore.length];
+                    int last = mergestuscore.length - 1;
+                    double score = 0;
+                    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);
+                        }
+                    }
+                    for (int i = 0; i < mptqids.length; i++) {
+                        MsPaperStudentQuestion studentQuestion = new MsPaperStudentQuestion();
+                        studentQuestion.setMptqid(N_Utils.obj2Int(mptqids[i]));
+                        studentQuestion.setStuscore(scores[i]);
+                        studentQuestion.setArbitratescore(scores[i]);
+                        studentQuestions.add(studentQuestion);
+                    }
+                }
+            }
+
+            //更处理结果
+            MsPaperStudentBlock psq = new MsPaperStudentBlock();
+            psq.setMpsbid(mpsbid);
+            psq.setChecked(3);
+            psq.setHasgood(hasgood);
+            psq.setHasbad(hasbad);
+            psq.setHasproblem(3);
+            psq.setProblehid(handleid);
+            msPaperStudentBlockMapper.updateByPrimaryKeySelective(psq);
+            msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, psq);
+        } else {
+            //更新处理结果
+            MsPaperStudentQuestion psq = new MsPaperStudentQuestion();
+            psq.setMpsqid(mpsbid);
+            psq.setChecked(3);
+            psq.setStuscore(arbitratescore);
+            psq.setHasgood(hasgood);
+            psq.setHasbad(hasbad);
+            psq.setHasproblem(3);
+            psq.setProblehid(handleid);
+            msPaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
+        }
+    }
+
+    /**
+     * @Description 获取上一份疑难卷
+     * @Date 2024/11/21 14:35
+     * @Author YWX
+     * @Param [param]
+     * @Return java.util.Map
+     **/
+    public Map getPreProblem(MsCheckParam param) {
+        return msPaperCheckTeacherProblemMapper.getPreProblem(param);
+    }
+
+    /**
+     * @Description 历史记录列表
+     * @Date 2024/11/21 11:00
+     * @Author YWX
+     * @Param [param]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listHistory(MsCheckParam param) {
+        return msPaperCheckTeacherProblemMapper.listHistory(param);
+    }
+
+    /**
+     * @Description 历史记录详情
+     * @Date 2024/11/21 14:04
+     * @Author YWX
+     * @Param [param]
+     * @Return java.util.Map
+     **/
+    public Map detailHistory(MsCheckParam param) {
+        return msPaperCheckTeacherProblemMapper.detailHistory(param);
+    }
+
+    /**
+     * @Description 打回重阅
+     * @Date 2024/11/21 15:19
+     * @Author YWX
+     * @Param [param]
+     * @Return void
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void backCorrect(MsPaperCheckVo param) {
+        msPaperCheckTeacherProblemMapper.backCorrect(param);//打回重阅
+        msPaperCheckTeacherProblemMapper.deleteByMpsbidAndMpid(param.getMpsbid(), param.getMpid());//删除单个任务
+    }
+}

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

@@ -382,6 +382,11 @@ public class MsPaperCheckTeacherTaskService {
         Integer hasproblem = param.getHasproblem();
         Integer problemtype = param.getProblemtype();
         String problemcomm = param.getProblemcomm();
+        Integer handleid = param.getHandleid();
+        Integer probleid = null;
+        if (hasproblem.equals(1)) {
+            probleid = handleid;
+        }
         Double qscore = param.getQscore();
         List<MsPaperBlockQuestion> questions = param.getQuestions();
         int checked = 2;
@@ -406,6 +411,7 @@ public class MsPaperCheckTeacherTaskService {
                 block.setHasproblem(hasproblem);
                 block.setProblemtype(problemtype);
                 block.setProblemcomm(problemcomm);
+                block.setProbleid(probleid);
                 msPaperStudentBlockMapper.updateByPrimaryKeySelective(block);
                 block.setStudentid(param.getStudentid());
                 block.setMblockid(param.getMblockid());
@@ -454,11 +460,11 @@ public class MsPaperCheckTeacherTaskService {
                 question.setHasproblem(hasproblem);
                 question.setProblemtype(problemtype);
                 question.setProblemcomm(problemcomm);
+                question.setProbleid(probleid);
                 question.setStuscore(firstccore);
                 msPaperStudentQuestionMapper.updateByPrimaryKeySelective(question);
             }
         } else {//双评
-            Integer handleid = param.getHandleid();
             Integer firstcid = param.getFirstcid();
             Integer secondcid = param.getSecondcid();
             Integer firstcime = param.getFirstcime();
@@ -589,6 +595,7 @@ public class MsPaperCheckTeacherTaskService {
                 block.setHasproblem(hasproblem);
                 block.setProblemtype(problemtype);
                 block.setProblemcomm(problemcomm);
+                block.setProbleid(probleid);
                 block.setStudentid(param.getStudentid());
                 block.setMblockid(param.getMblockid());
                 block.setArbitratestate(arbitratestate);
@@ -613,6 +620,7 @@ public class MsPaperCheckTeacherTaskService {
                 question.setHasproblem(hasproblem);
                 question.setProblemtype(problemtype);
                 question.setProblemcomm(problemcomm);
+                question.setProbleid(probleid);
                 question.setStuscore(endscore);
                 question.setMpsqid(mpsbid);
                 question.setArbitratestate(arbitratestate);

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

@@ -42,4 +42,6 @@ public class MsCheckParam extends BaseBean {
     private String subjectid;
     //阅卷仲裁教师任务ID
     private Integer mpctaid;
+    //疑难卷教师任务ID
+    private Integer mpctpid;
 }

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

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherArbitrateMapper">
+    <!--保存或更新单个任务-->
+    <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})
+        on duplicate key update taskorder=#{m.taskorder},teacherid=#{m.teacherid}
+    </insert>
     <!--教师阅卷-待/已仲裁列表-->
     <select id="listArbitrate" resultType="java.util.Map">
         select s.msid,s.subjectname,s.sdate,s.begintime,s.endtime,e.examname,e.gradeid,e.examtype
@@ -111,6 +117,12 @@
         <result property="hidefirstscore" column="hidefirstscore"/>
         <collection property="questions" select="listQuestion" column="mblockid"/>
     </resultMap>
+    <select id="listQuestion" resultType="java.util.Map">
+        select pbq.mbqid,pbq.mptqid,pbq.mbqtype,pbq.bqscore,pbq.bqorder,pbq.bqn
+        ,pbq.mergeqid,pbq.mergeqn,pbq.mergescore,pbq.scorestepway,pbq.scorestep
+        from ms_paper_block_question pbq where pbq.mblockid=#{mblockid}
+        order by pbq.bqn
+    </select>
     <select id="listBlockArbitrate" resultMap="arbitrateBlockResultMap">
         select pb.blockname,pb.blockorder,pb.bqnum
         ,pc.mblockid,pc.hidefirstscore

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

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherProblemMapper">
+    <!--保存或更新单个任务-->
+    <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})
+        on duplicate key update taskorder=#{m.taskorder},teacherid=#{m.teacherid}
+    </insert>
+    <!--删除单个任务-->
+    <delete id="deleteByMpsbidAndMpid">
+        delete from ms_paper_check_teacher_problem where mpsbid=#{mpsbid} and mpid=#{mpid}
+    </delete>
+    <!--疑难卷题块列表-->
+    <resultMap id="arbitrateBlockResultMap" type="java.util.Map">
+        <result property="mblockid" column="mblockid"/>
+        <result property="blockname" column="blockname"/>
+        <result property="blockorder" column="blockorder"/>
+        <result property="bqnum" column="bqnum"/>
+        <result property="hidefirstscore" column="hidefirstscore"/>
+        <collection property="questions" select="listQuestion" column="mblockid"/>
+    </resultMap>
+    <select id="listQuestion" resultType="java.util.Map">
+        select pbq.mbqid,pbq.mptqid,pbq.mbqtype,pbq.bqscore,pbq.bqorder,pbq.bqn
+        ,pbq.mergeqid,pbq.mergeqn,pbq.mergescore,pbq.scorestepway,pbq.scorestep
+        from ms_paper_block_question pbq where pbq.mblockid=#{mblockid}
+        order by pbq.bqn
+    </select>
+    <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
+        group by pb.mblockid
+        order by pb.blockorder
+    </select>
+    <!--疑难卷试题列表-->
+    <select id="listQuestionProblem" resultType="java.util.Map">
+        select psb.qorder,psb.qn,psb.qscore
+        from ms_paper_student_question psb
+        where psb.mpid=#{param.mpid} and psb.hasproblem=1
+        group by psb.mptqid
+        order by psb.mptqid
+    </select>
+    <!--获取疑难卷任务-->
+    <select id="getCorrectLeaderProblem" resultType="java.util.Map">
+        <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}))
+            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>
+    <!--获取疑难卷数量-->
+    <select id="getPCheckNum" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher">
+        <if test="param.correcttype==3">
+            select count(psb.mpsbid) as tasknum
+            ,count(if(psb.hasproblem=3 and psb.problehid=#{param.handleid},psb.mpsbid,null)) as checkednum
+            from ms_paper_student_block psb
+            where psb.mpid=#{param.mpid} and psb.hasproblem in(1,2,3)
+        </if>
+        <if test="param.correcttype==2">
+            select count(psb.mpsqid) as tasknum
+            ,count(if(psb.hasproblem=3 and psb.problehid=#{param.handleid},psb.mpsqid,null)) as checkednum
+            from ms_paper_student_question psb
+            where psb.mpid=#{param.mpid} and psb.hasproblem in(1,2,3)
+        </if>
+    </select>
+    <!--获取上一份疑难卷-->
+    <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
+        ,u.username as studentname,u.examno,u2.username as teachername
+        from ms_paper_check_teacher_problem pctp
+        <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 pctp.mpsbid=psq.mpsqid
+        </if>
+        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
+    </select>
+    <!--历史记录列表-->
+    <select id="listHistory" resultType="java.util.Map">
+        select pctp.mpctpid,pctp.mpsbid,pctp.checkscore,pctp.taskorder
+        ,(case when pctp.hasgood=1 then '优' when pctp.hasbad=1 then '违' else '' end) as comm
+        from ms_paper_check_teacher_problem pctp
+        where pctp.mpid=#{param.mpid} and pctp.teacherid=#{param.handleid} and pctp.mblockid=#{param.mblockid} and pctp.checkstate=3
+        <if test="param.taskorder!=null and param.taskorder!=0">
+            and pctp.taskorder=#{param.taskorder}
+        </if>
+        order by pctp.mpsbid desc
+    </select>
+    <!--历史记录详情-->
+    <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
+        ,u.username as studentname,u.examno,u2.username as teachername
+        from ms_paper_check_teacher_problem pctp
+        <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 pctp.mpsbid=psq.mpsqid
+        </if>
+        inner join t_user u on psq.studentid = u.userid
+        inner join t_user u2 on psq.probleid = u2.userid
+        where pctp.mpctpid=#{param.mpctpid}
+    </select>
+    <!--打回重阅-->
+    <select id="backCorrect">
+        update ms_paper_check_teacher_task pctt
+        <if test="param.correcttype==3">
+            inner join ms_paper_student_block psb on pctt.mpsbid=psb.mpsbid
+            inner join ms_paper_student_question psq on psb.mblockid=psq.mblockid
+        </if>
+        <if test="param.correcttype==2">
+            inner join ms_paper_student_question psq on pctt.mpsbid=psq.mpsqid
+        </if>
+        set pctt.checkstate=1,psq.checked=1,psq.hasproblem=0,psq.problemtype=0,psq.problemcomm='',psq.firstcime=null,psq.secondctime=null
+        <if test="param.correcttype==3">
+            ,psb.checked=1,psb.hasproblem=0,psb.problemtype=0,psb.problemcomm='',psb.firstcime=null,psb.secondctime=null
+        </if>
+        where pctt.mpid=#{param.mpid} and pctt.mpsbid=#{param.mpsbid}
+    </select>
+</mapper>

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

@@ -6,14 +6,14 @@
         <foreach collection ="tasks" item="s" index= "index" separator =";">
             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}
+            on duplicate key update taskorder=#{s.taskorder},teacherid=#{s.teacherid}
         </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}
+        on duplicate key update taskorder=#{s.taskorder},teacherid=#{s.teacherid}
     </insert>
     <!--批量更新任务信息-->
     <update id="batchUpdate">
@@ -194,51 +194,52 @@
     </select>
     <!--教师阅卷-待/已阅卷列表-->
     <select id="listCorrect" 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.firstcid = #{param.handleid} and psb.firstcime>0,psb.mpsbid,null))
         +count(distinct if(pc.checktype=2 and psb.secondcid = #{param.handleid} and psb.secondctime>0,psb.mpsbid,null))
-        )*100/count(distinct psb.mpsbid)*pc.checktype,2) as checkrate
+        )*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
         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 and psb.checked!=0
+        inner join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid
         where e.schoolid=#{param.schoolid} and s.checkstate=1 and e.deleted=1 and pc.dispenseway=2 and pc.correcttype=3
+        and (psb.checked=1 or (psb.checked in(2,3) and (psb.firstcid=#{param.handleid} or psb.secondcid=#{param.handleid})))
         group by s.msid
         <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
-        ,truncate((count(distinct if(psb.firstcid = #{param.handleid} and psb.firstcime>0,psb.mpsqid,null))
-        +count(distinct if(pc.checktype=2 and psb.secondcid = #{param.handleid} and psb.secondctime>0,psb.mpsqid,null))
-        )*100/count(distinct psb.mpsqid)*pc.checktype,2) as checkrate
+        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.firstcime>0 or psb.secondctime>0,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
         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 and psb.checked!=0
+        inner join ms_paper_student_question psb on psb.mptqid = pc.mblockid and psb.mpid = pc.mpid
         where e.schoolid=#{param.schoolid} and s.checkstate=1 and e.deleted=1 and pc.dispenseway=2 and pc.correcttype=2
+        and (psb.checked=1 or (psb.checked in(2,3) and (psb.firstcid=#{param.handleid} or psb.secondcid=#{param.handleid})))
         group by s.msid
         <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
-        ,truncate((count(distinct if(psb.firstcid = #{param.handleid} and psb.firstcime>0,psb.mpsqid,null))
-        +count(distinct if(pc.checktype=2 and psb.secondcid = #{param.handleid} and psb.secondctime>0,psb.mpsqid,null))
-        )*100/count(distinct psb.mpsqid)*pc.checktype,2) as checkrate
+        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.firstcime>0 or psb.secondctime>0,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
         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 and psb.checked!=0
+        inner join ms_paper_student_question psb on psb.studentid = cs.studentid and psb.mpid = pc.mpid
         where e.schoolid=#{param.schoolid} and s.checkstate=1 and e.deleted=1 and pc.dispenseway=2 and pc.correcttype=1
+        and (psb.checked=1 or (psb.checked in(2,3) and (psb.firstcid=#{param.handleid} or psb.secondcid=#{param.handleid})))
         group by s.msid
         <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(pctt.checkstate=3,pctt.mpcttid,null)))*100/count(distinct pctt.mpcttid),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
@@ -255,13 +256,14 @@
         <if test="param.correcttype==3">
             select pb.blockname,pb.blockorder,pb.bqnum
             ,pc.mblockid,pc.checktype,pc.dispenseway,pc.numtype
-            ,count(distinct psb.mpsbid)*pc.checktype as totalNum
-            ,count(distinct if(psb.firstcime is not null,psb.mpsbid,null))+count(distinct if(psb.secondctime is not null,psb.mpsbid,null)) as totalCheckedNum
-            ,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 psb.mpsbid) as totalNum
+            ,count(distinct if(psb.checked=3,psb.mpsbid,null)) as totalCheckedNum
+            ,count(distinct if(psb.checked in(1,2),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 in(1,2)
+            or (psb.secondctime is null and psb.secondcid=#{param.handleid}) or psb.checked=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
             and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or pc.dispenseway=2)
             inner join ms_paper_block pb on pc.mblockid = pb.mblockid and pb.mpid = pc.mpid
@@ -273,12 +275,12 @@
         <if test="param.correcttype==2">
             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>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 psb.mpsqid) as totalNum
+            ,count(distinct if(psb.checked=3,psb.mpsqid,null)) as totalCheckedNum
+            ,count(distinct if(psb.checked in(1,2),psb.mpsqid,null)) as totalUncheckedNum
             ,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 in(1,2)
+            or (psb.secondctime is null and psb.secondcid=#{param.handleid}) or psb.checked=1)
             ,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
@@ -292,17 +294,17 @@
             select c.classname,c.classtype
             ,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 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.checked=3,psb.mpsqid,null)) as totalCheckedNum
+            ,count(distinct if(psb.checked in(1,2),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 in(1,2)
+            or (psb.secondctime is null and psb.secondcid=#{param.handleid}) or psb.checked=1)
             ,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
             inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid and pct.teacherid = #{param.handleid}
             left join ms_paper_student_question psb on psb.mpid = pc.mpid and psb.studentid=cs.studentid and psb.answered=1 and psb.ctype in(3,13,14,15)
-            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or pc.dispenseway=2)
+            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or psb.checked=1)
             where pc.mpid=#{param.mpid} and c.subjectid=#{param.subjectid}
             group by c.classid
             order by c.mcid
@@ -576,23 +578,23 @@
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
             <if test="param.correcttype==3">
-                select count(psb.mpsbid*#{param.checktype}) as tasknum
+                select count(psb.mpsbid) as tasknum
                 ,count(if(pctt.checkstate=3,1,null)) as checkednum
                 from ms_paper_student_block psb left join ms_paper_check_teacher_task pctt on psb.mpid=pctt.mpid and pctt.teacherid=#{param.teacherid} and psb.mpsbid=pctt.mpsbid
-                where psb.mpid=#{param.mpid} and psb.mblockid=#{param.mblockid}
+                where psb.mpid=#{param.mpid} and psb.mblockid=#{param.mblockid} and psb.checked!=0
             </if>
             <if test="param.correcttype==2">
-                select count(psb.mpsqid*#{param.checktype}) as tasknum
+                select count(psb.mpsqid) as tasknum
                 ,count(if(pctt.checkstate=3,1,null)) as checkednum
                 from ms_paper_student_question psb left join ms_paper_check_teacher_task pctt on psb.mpid=pctt.mpid and pctt.teacherid=#{param.teacherid} and psb.mpsqid=pctt.mpsbid
-                where psb.mpid=#{param.mpid} and psb.mptqid=#{param.mblockid}
+                where psb.mpid=#{param.mpid} and psb.mptqid=#{param.mblockid} and psb.checked!=0
             </if>
             <if test="param.correcttype==1">
-                select count(psb.mpsqid*#{param.checktype}) as tasknum
+                select count(psb.mpsqid) as tasknum
                 ,count(if(pctt.checkstate=3,1,null)) as checkednum
                 from ms_paper_student_question psb left join ms_paper_check_teacher_task pctt on psb.mpid=pctt.mpid and pctt.teacherid=#{param.teacherid} and psb.mpsqid=pctt.mpsbid
                 inner join ms_class_student cs on psb.examid=cs.examid and psb.subjectid=cs.subjectid and psb.studentid=cs.studentid
-                where psb.mpid=#{param.mpid} and psb.mptqid=#{param.mptqid} and cs.classid=#{param.mblockid}
+                where psb.mpid=#{param.mpid} and psb.mptqid=#{param.mptqid} and cs.classid=#{param.mblockid} and psb.checked!=0
             </if>
         </if>
     </select>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentQuestionMapper.xml

@@ -200,6 +200,9 @@
         <if test="block.problemcomm!=null and block.problemcomm!=''">
            ,problemcomm=#{block.problemcomm}
         </if>
+        <if test="block.probleid!=null and block.probleid!=0">
+            ,probleid=#{block.probleid}
+        </if>
         <if test="block.hasfinal!=null and block.hasfinal!=0">
            ,hasfinal=#{block.hasfinal}
         </if>