教师阅卷

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

@@ -81,10 +81,10 @@ public class EPaperCorrectTeacherController {
     @PostMapping("/get_cq")
     public ResultVo getCorrectQuestion(@RequestBody EPTeacherVo vo) {
         Integer teacherid = vo.getTeacherid();
-        String eptqids = vo.getEptqids();
+        Integer eptqid = vo.getEptqid();
         Integer esid = vo.getEsid();
-        N_Utils.validation(new Object[]{teacherid, "教师id", 1, eptqids, "试卷试题ids", 2, esid, "考试科目id", 1});
-        return correctTeacherService.getCorrectQuestion(teacherid, eptqids, vo.getClassids(), esid);
+        N_Utils.validation(new Object[]{teacherid, "教师id", 1, eptqid, "试卷试题id", 1, esid, "考试科目id", 1});
+        return correctTeacherService.getCorrectQuestion(teacherid, eptqid, vo.getClassids(), esid);
     }
 
     /**
@@ -97,10 +97,10 @@ public class EPaperCorrectTeacherController {
      **/
     @PostMapping("/get_pre")
     public ResultVo getPreQuestion(@RequestBody EPTeacherVo vo) {
-        Integer epid = vo.getEpid();
+        Integer eptqid = vo.getEptqid();
         Integer teacherid = vo.getTeacherid();
-        N_Utils.validation(new Object[]{epid, "试卷id", 1, teacherid, "教师id", 1});
-        return correctTeacherService.getPreQuestion(epid, teacherid);
+        N_Utils.validation(new Object[]{eptqid, "试卷试题id", 1, teacherid, "教师id", 1});
+        return correctTeacherService.getPreQuestion(eptqid, teacherid);
     }
 
     /**

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

@@ -16,7 +16,7 @@ public interface EPaperCorrectTeacherMapper {
 
     //随机获取一条待批阅试题
     EPaperSQuestionVo getCorrectQuestion(@Param("teacherid") Integer teacherid,
-                                         @Param("eptqids") String eptqids, @Param("classids") String classids);
+                                         @Param("eptqid") Integer eptqid, @Param("classids") String classids);
 
     //试题批阅情况
     EPaperSQuestionVo getCheckQuestion(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);
@@ -25,7 +25,7 @@ public interface EPaperCorrectTeacherMapper {
     void updateCheckQuestionById(@Param("epsqid") Integer epsqid, @Param("teacherid") Integer teacherid);
 
     //获取上一份批阅试题
-    Map getPreQuestion(@Param("epid") Integer epid, @Param("teacherid") Integer teacherid);
+    Map getPreQuestion(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);
 
     //阅卷记录
     List<Map> listRecord(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);

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

@@ -37,12 +37,12 @@ public class EPaperCorrectTeacherService {
     }
 
     //随机获取待批试题
-    public ResultVo getCorrectQuestion(Integer teacherid, String eptqids, String classids, Integer esid) {
+    public ResultVo getCorrectQuestion(Integer teacherid, Integer eptqid, String classids, Integer esid) {
         lock.lock();
         Map map = correctTeacherMapper.getExamNameByEsId(esid);//根据考试科目id获取考试名称
         try {
             //随机获取一条待批阅试题
-            EPaperSQuestionVo sq = correctTeacherMapper.getCorrectQuestion(teacherid, eptqids, classids);
+            EPaperSQuestionVo sq = correctTeacherMapper.getCorrectQuestion(teacherid, eptqid, classids);
             if (sq == null) return new ResultVo(0, "已批阅完成");
             //修改试卷学生试题为批阅中
             correctTeacherMapper.updateCheckQuestionById(sq.getEpsqid(), teacherid);

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

@@ -20,7 +20,7 @@ public class EPTeacherVo {
     private Integer teacherid;
 
     //试卷试题ids
-    private String eptqids;
+    private Integer eptqid;
 
     //班级ids
     private String classids;

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

@@ -50,7 +50,7 @@
     <!--随机获取一条待批阅试题-->
     <select id="getCorrectQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
         select psq.epsqid,psq.stuanswer,psq.qn,psq.eptqid,psq.qscore,psq.epsid
-        from e_paper_student_question psq where psq.eptqid in(${eptqids})
+        from e_paper_student_question psq where psq.eptqid=#{eptqid}
         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})
@@ -70,7 +70,7 @@
     <!--获取上一份批阅试题-->
     <select id="getPreQuestion" resultType="java.util.Map">
         select psq.epsqid,psq.stuanswer,psq.qn,psq.qorder,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
-        from e_paper_student_question psq where psq.epid=#{epid} and psq.checked=2 and psq.checkid=#{teacherid}
+        from e_paper_student_question psq where psq.eptqid=#{eptqid} and psq.checked=2 and psq.checkid=#{teacherid}
         order by psq.checktime desc limit 1
     </select>
     <!--阅卷记录-->

sexam/src/main/resources/mapper/report/EReportGenerateMapper.xml

@@ -12,4 +12,9 @@
         from e_paper ep left join e_paper_analyze epa on ep.epid = epa.epid
         where ep.examid=#{examid}
     </select>
+    <select id="listStu" resultType="com.xhkjedu.sexam.model.reportstu.ERstudent">
+        select er.studentid,er.subjectid,er.classrank,er.schoolrank
+        from(select max(er.rsid)rsid from e_class_student ecs left join e_rstudent er on ecs.studentid = er.studentid
+        where ecs.examid=#{examid} group by er.studentid,er.subjectid)a left join e_rstudent er on a.rsid=er.rsid
+    </select>
 </mapper>