教师阅卷

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

@@ -80,11 +80,10 @@ public class EPaperCorrectTeacherController {
      **/
     @PostMapping("/get_cq")
     public ResultVo getCorrectQuestion(@RequestBody EPTeacherVo vo) {
-        Integer epid = vo.getEpid();
         Integer teacherid = vo.getTeacherid();
-        String qorders = vo.getQorders();
-        N_Utils.validation(new Object[]{epid, "试卷id", 1, teacherid, "教师id", 1, qorders, "页码", 2});
-        return correctTeacherService.getCorrectQuestion(epid, teacherid, qorders, vo.getClassids());
+        String eptqids = vo.getEptqids();
+        N_Utils.validation(new Object[]{teacherid, "教师id", 1, eptqids, "试卷试题ids", 2});
+        return correctTeacherService.getCorrectQuestion(teacherid, eptqids, vo.getClassids());
     }
 
     /**
@@ -113,15 +112,14 @@ public class EPaperCorrectTeacherController {
      **/
     @PostMapping("/list_jl")
     public ResultVo listRecord(@RequestBody EPaperCorrectquestion vo) {
-        Integer epid = vo.getEpid();
         Integer teacherid = vo.getTeacherid();
-        Integer qorder = vo.getQorder();
+        Integer eptqid = vo.getEptqid();
         Integer page = vo.getPage();
         Integer pageSize = vo.getPageSize();
-        N_Utils.validation(new Object[]{epid, "试卷id", 1, teacherid, "教师id", 1, qorder, "试题排序", 1
+        N_Utils.validation(new Object[]{eptqid, "试卷试题id", 1, teacherid, "教师id", 1
                 , page, "页码", 1, pageSize, "显示条数", 1});
         PageHelper.startPage(page, pageSize);
-        List<Map> list = correctTeacherService.listRecord(epid, teacherid, qorder);
+        List<Map> list = correctTeacherService.listRecord(eptqid, teacherid);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
         return new ResultVo(0, "获取成功", pageResult);
     }

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

@@ -15,12 +15,11 @@ public interface EPaperCorrectTeacherMapper {
     List<Map> listMarked(@Param("teacherid") Integer teacherid);
 
     //随机获取一条待批阅试题
-    EPaperSQuestionVo getCorrectQuestion(@Param("epid") Integer epid, @Param("teacherid") Integer teacherid,
-                                         @Param("qorders") String qorders, @Param("classids") String classids);
+    EPaperSQuestionVo getCorrectQuestion(@Param("teacherid") Integer teacherid,
+                                         @Param("eptqids") String eptqids, @Param("classids") String classids);
 
     //试题批阅情况
-    EPaperSQuestionVo getCheckQuestion(@Param("epid") Integer epid, @Param("teacherid") Integer teacherid,
-                                       @Param("qorder") Integer qorder);
+    EPaperSQuestionVo getCheckQuestion(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);
 
     //修改试卷学生试题为批阅中
     void updateCheckQuestionById(@Param("epsqid") Integer epsqid, @Param("teacherid") Integer teacherid);
@@ -29,7 +28,7 @@ public interface EPaperCorrectTeacherMapper {
     Map getPreQuestion(@Param("epid") Integer epid, @Param("teacherid") Integer teacherid);
 
     //阅卷记录
-    List<Map> listRecord(@Param("epid") Integer epid, @Param("teacherid") Integer teacherid, @Param("qorder") Integer qorder);
+    List<Map> listRecord(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);
 
     //批阅试题
     void correctQuestion(@Param("psq") EPaperStudentQuestion psq);

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

@@ -38,17 +38,17 @@ public class EPaperCorrectTeacherService {
     }
 
     //随机获取待批试题
-    public ResultVo getCorrectQuestion(Integer epid, Integer teacherid, String qorders, String classids) {
+    public ResultVo getCorrectQuestion(Integer teacherid, String eptqids, String classids) {
         lock.lock();
         Map map = new HashMap();
         try {
             //随机获取一条待批阅试题
-            EPaperSQuestionVo sq = correctTeacherMapper.getCorrectQuestion(epid, teacherid, qorders, classids);
+            EPaperSQuestionVo sq = correctTeacherMapper.getCorrectQuestion(teacherid, eptqids, classids);
             if (sq == null) return new ResultVo(1, "已批阅完成");
             //修改试卷学生试题为批阅中
             correctTeacherMapper.updateCheckQuestionById(sq.getEpsqid(), teacherid);
             //试题批阅情况
-            EPaperSQuestionVo q = correctTeacherMapper.getCheckQuestion(epid, teacherid, sq.getQorder());
+            EPaperSQuestionVo q = correctTeacherMapper.getCheckQuestion(sq.getEptqid(), teacherid);
             Integer tjnum = q.getTjnum();
             Integer pynum = q.getPynum();
             map.put("sq", sq);//学生待批试题
@@ -73,8 +73,8 @@ public class EPaperCorrectTeacherService {
     }
 
     //阅卷记录
-    public List<Map> listRecord(Integer epid, Integer teacherid, Integer qorder) {
-        return correctTeacherMapper.listRecord(epid, teacherid, qorder);
+    public List<Map> listRecord(Integer eptqid, Integer teacherid) {
+        return correctTeacherMapper.listRecord(eptqid, teacherid);
     }
 
     //批阅试题

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

@@ -16,8 +16,8 @@ public class EPTeacherVo {
     //教师id
     private Integer teacherid;
 
-    //试题排序
-    private String qorders;
+    //试卷试题ids
+    private String eptqids;
 
     //班级ids
     private String classids;

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

@@ -14,7 +14,7 @@ public class EPaperSQuestionVo {
     private Integer epsqid;//试卷学生试题id
     private String stuanswer;//学生答案
     private String qn;//试题题号
-    private Integer qorder;//试题排序
+    private Integer eptqid;//试题排序
     private double qscore;//分值
     private Integer tjnum;//提交人数
     private Integer pynum;//批阅人数

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

@@ -5,8 +5,8 @@
     <select id="listPending" resultType="java.util.Map">
         select a.*,eb.examname,eb.gradeid,eb.examtype,es.sdate,es.begintime,es.endtime,es.subjectname
         ,truncate(a.pynum*100/a.tjnum,2)pgrate
-        from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
-        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,group_concat(distinct pc.classid)classids
+        from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.eptqid)qns
+        ,group_concat(distinct pq.eptqid order by pq.eptqid)eptqids,group_concat(distinct pc.classid)classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
@@ -14,8 +14,8 @@
         left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
         where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15) group by p.epid
         union
-        select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
-        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,0 classids
+        select p.esid,p.epid,group_concat(distinct pq.qn order by pq.eptqid)qns
+        ,group_concat(distinct pq.eptqid order by pq.eptqid)eptqids,0 classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
@@ -28,8 +28,8 @@
     <select id="listMarked" resultType="java.util.Map">
         select a.*,eb.examname,eb.gradeid,eb.examtype,es.sdate,es.begintime,es.endtime,es.subjectname
         ,100 pgrate
-        from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
-        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,group_concat(distinct pc.classid)classids
+        from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.eptqid)qns
+        ,group_concat(distinct pq.eptqid order by pq.eptqid)eptqids,group_concat(distinct pc.classid)classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
@@ -37,8 +37,8 @@
         left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
         where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15) group by p.epid
         union
-        select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
-        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,0 classids
+        select p.esid,p.epid,group_concat(distinct pq.qn order by pq.eptqid)qns
+        ,group_concat(distinct pq.eptqid order by pq.eptqid)eptqids,0 classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
@@ -49,8 +49,8 @@
     </select>
     <!--随机获取一条待批阅试题-->
     <select id="getCorrectQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
-        select psq.epsqid,psq.stuanswer,psq.qn,psq.qorder,psq.qscore,psq.epsid
-        from e_paper_student_question psq where psq.epid=#{epid} and psq.qorder in(${qorders})
+        select psq.epsqid,psq.stuanswer,psq.qn,psq.eptqid,psq.qscore,psq.epsid
+        from e_paper_student_question psq where psq.eptqid in(${eptqids})
         and psq.answered=1 and (psq.checked=0 or (psq.checked=1 and psq.checkid=#{teacherid}))
         <if test="classids!=null and classids!=''">
             and psq.classid in(${classids})
@@ -61,7 +61,7 @@
     <select id="getCheckQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
         select count(psq.epsqid)tjnum,count(case when psq.checked=2 then psq.epsqid else null end)pynum
         ,count(case when psq.checked=2 and psq.checkid=#{teacherid} then psq.epsqid else null end)wpynum
-        from e_paper_student_question psq where psq.epid=#{epid} and psq.qorder=#{qorder} and psq.answered=1
+        from e_paper_student_question psq where psq.eptqid=#{eptqid} and psq.answered=1
     </select>
     <!--修改试卷学生试题为批阅中-->
     <update id="updateCheckQuestionById">
@@ -75,8 +75,8 @@
     </select>
     <!--阅卷记录-->
     <select id="listRecord" resultType="java.util.Map">
-        select psq.epsqid,psq.stuanswer,psq.qorder,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.checktime
-        from e_paper_student_question psq where psq.epid=#{epid} and psq.qorder=#{qorder}
+        select psq.epsqid,psq.stuanswer,psq.eptqid,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.checktime
+        from e_paper_student_question psq where psq.eptqid=#{eptqid}
         and psq.checked=2 and psq.checkid=#{teacherid}
         order by psq.checktime desc
     </select>