批阅

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperCorrectTeacherController.java

@@ -159,4 +159,37 @@ public class EPaperCorrectTeacherController {
         Map map = correctTeacherService.markProgress(examid);
         return new ResultVo(0, "获取成功", map);
     }
+
+    /**
+     * 已批阅试题上一份
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [vo]
+     * @Author ywx
+     * @Date 2022/9/22 11:38
+     **/
+    @PostMapping("/get_yppre")
+    public ResultVo getCheckedPreQuestion(@RequestBody EPTeacherVo vo) {
+        Integer eptqid = vo.getEptqid();
+        Integer teacherid = vo.getTeacherid();
+        N_Utils.validation(new Object[]{eptqid, "试卷试题id", 1, teacherid, "教师id", 1});
+        return correctTeacherService.getCheckedQuestion(eptqid, teacherid, vo.getChecktime(), 1);
+    }
+
+    /**
+     * 已批阅试题下一份
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [vo]
+     * @Author ywx
+     * @Date 2022/9/22 14:05
+     **/
+    @PostMapping("/get_ypnext")
+    public ResultVo getCheckedNextQuestion(@RequestBody EPTeacherVo vo) {
+        Integer eptqid = vo.getEptqid();
+        Integer teacherid = vo.getTeacherid();
+        Integer checktime = vo.getChecktime();
+        N_Utils.validation(new Object[]{eptqid, "试卷试题id", 1, teacherid, "教师id", 1, checktime, "批改时间", 1});
+        return correctTeacherService.getCheckedQuestion(eptqid, teacherid, checktime, 2);
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperCorrectTeacherMapper.java

@@ -51,4 +51,8 @@ public interface EPaperCorrectTeacherMapper {
 
     //获取试卷试题题号
     List<Map> listQnByEpId(@Param("epid") Integer epid);
+
+    //获取已批阅试题
+    Map getCheckedQuestion(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid
+            , @Param("checktime") Integer checktime, @Param("type") Integer type);
 }

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperCorrectTeacherService.java

@@ -59,14 +59,18 @@ public class EPaperCorrectTeacherService {
         try {
             //随机获取一条待批阅试题
             EPaperSQuestionVo sq = correctTeacherMapper.getCorrectQuestion(teacherid, eptqid, classids);
-            if (sq == null) return new ResultVo(0, "已批阅完成");
-            //修改试卷学生试题为批阅中
-            correctTeacherMapper.updateCheckQuestionById(sq.getEpsqid(), teacherid);
+            if (sq == null) {
+                Map question = correctTeacherMapper.getCheckedQuestion(eptqid, teacherid, null, 1);
+                map.put("sq", question);//学生已批试题
+            } else {
+                map.put("sq", sq);//学生待批试题
+                //修改试卷学生试题为批阅中
+                correctTeacherMapper.updateCheckQuestionById(sq.getEpsqid(), teacherid);
+            }
             //试题批阅情况
-            EPaperSQuestionVo q = correctTeacherMapper.getCheckQuestion(sq.getEptqid(), teacherid);
+            EPaperSQuestionVo q = correctTeacherMapper.getCheckQuestion(eptqid, teacherid);
             Integer tjnum = q.getTjnum();
             Integer pynum = q.getPynum();
-            map.put("sq", sq);//学生待批试题
             map.put("tjnum", tjnum);//提交人数
             map.put("pynum", pynum);//批阅人数
             map.put("wpynum", q.getWpynum());//我批阅人数
@@ -207,4 +211,10 @@ public class EPaperCorrectTeacherService {
         map.put("papers", papers);
         return map;
     }
+
+    //获取已批阅试题
+    public ResultVo getCheckedQuestion(Integer eptqid, Integer teacherid, Integer checktime, Integer type) {
+        Map question = correctTeacherMapper.getCheckedQuestion(eptqid, teacherid, checktime, type);
+        return new ResultVo(0, "获取成功", question);
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EScanbatchService.java

@@ -139,7 +139,7 @@ public class EScanbatchService {
         Map map = eScanbatchMapper.getScanDetail(epid);
         List<Map> classes = eClassMapper.listByExamId(examid);
         int jhnum = classes.stream().mapToInt(m -> (int) m.get("classnum")).sum();
-        Integer ysnum = (Integer) map.get("ysnum");//已扫人数
+        Integer ysnum = N_Utils.str2Int(map.get("ysnum").toString());//已扫人数
         Integer wsnum = ExamUtil.subtractInt(jhnum, ysnum);
         map.put("jhnum", jhnum);//计划人数
         map.put("wsnum", wsnum);//未扫人数

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPTeacherVo.java

@@ -24,4 +24,7 @@ public class EPTeacherVo {
 
     //班级ids
     private String classids;
+
+    //批改时间
+    private Integer checktime;
 }

sexam/src/main/resources/mapper/paper/EPaperCorrectTeacherMapper.xml

@@ -122,4 +122,22 @@
         select q.qn,q.eptqid
         from e_paper_qtype_question q where q.epid=#{epid}
     </select>
+    <!--获取已批阅试题-->
+    <select id="getCheckedQuestion" resultType="java.util.Map">
+        select psq.epsqid,psq.qn,psq.eptqid,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
+        ,psq.answertype,psq.stuanswer,psq.stuanswertxt,checked,psq.checktime
+        from e_paper_student_question psq where psq.eptqid=#{eptqid} and psq.checked=2 and psq.checkid=#{teacherid}
+        <if test="type==1 and checktime!=null">
+            and psq.checktime &lt; #{checktime}
+        </if>
+        <if test="type==2 and checktime!=null">
+            and psq.checktime > #{checktime}
+        </if>
+        <if test="type==1">
+            order by psq.checktime asc limit 1
+        </if>
+        <if test="type==2">
+            order by psq.checktime desc limit 1
+        </if>
+    </select>
 </mapper>