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

src/main/java/com/xhkjedu/controller/EPaperVerifyController.java

@@ -45,12 +45,11 @@ public class EPaperVerifyController {
         return new ResultVo(0, "获取成功！", map);
     }
 
-    //识别正确跳过
+    //识别跳过
     @PostMapping("/correct_skip")
     public ResultVo correctSkip(@RequestBody EPaperStudent0608 ps) {
-        Integer epsid = ps.getEpsid();
-        N_Utils.validation(new Object[]{epsid, "考试试卷学生id", 1});
-        ePaperVerifyService.correctSkip(epsid);
+        N_Utils.validation(new Object[]{ps.getEpid(), "考试试卷id", 1, ps.getStudentid(), "学生id", 1, ps.getVerified(), "是否验证", 1});
+        ePaperVerifyService.correctSkip(ps);
         return new ResultVo(0, "识别成功！");
     }
 

src/main/java/com/xhkjedu/mapper/EPaperVerifyMapper.java

@@ -24,8 +24,8 @@ public interface EPaperVerifyMapper {
     //获取学生试卷及试题作答
     Map getStudentPaper(@Param("ps") EPaperStudent0608 ps);
 
-    //识别正确跳过
-    void correctSkip(@Param("epsid") Integer epsid);
+    //识别跳过
+    void correctSkip(@Param("ps") EPaperStudent0608 ps);
 
     //获取试卷原试题答案
     List<EPaperQtypeQuestion> listPaperAnswer(@Param("epid") Integer epid);

src/main/java/com/xhkjedu/service/EPaperVerifyService.java

@@ -37,9 +37,9 @@ public class EPaperVerifyService {
         return ePaperVerifyMapper.getStudentPaper(ps);
     }
 
-    //识别正确跳过
-    public void correctSkip(Integer epsid) {
-        ePaperVerifyMapper.correctSkip(epsid);
+    //识别跳过
+    public void correctSkip(EPaperStudent0608 ps) {
+        ePaperVerifyMapper.correctSkip(ps);
     }
 
     //识别确认

src/main/resources/EPaperVerifyMapper.xml

@@ -34,10 +34,11 @@
             <result column="answered" property="answered" />
             <result column="answertype" property="answertype" />
             <result column="stuanswer" property="stuanswer" />
+            <result column="answertime" property="answertime" />
         </collection>
     </resultMap>
     <select id="getStudentPaper" resultMap="stuPaper">
-        SELECT ps.epsid,ps.epid,ps.stupic,ps.pagenum,ps.studentid,u.username,u.examno,ps.classid,c.classname,pt.qtypename,psq.epsqid,psq.eptqid,psq.qn,psq.ctype,psq.stuanswer
+        SELECT ps.epsid,ps.epid,ps.stupic,ps.pagenum,ps.studentid,u.username,u.examno,ps.classid,c.classname,pt.qtypename,psq.epsqid,psq.eptqid,psq.qn,psq.ctype,psq.stuanswer,psq.answertime
         from (select ps.epsid FROM e_paper_student0608 ps
         WHERE ps.examid=#{ps.examid} AND ps.subjectid=#{ps.subjectid} and ps.verified=#{ps.verified}
         <if test="ps.epsid!=null and ps.epsid!=0">ps.epsid>#{ps.epsid}</if>
@@ -51,10 +52,10 @@
         left join t_user u on ps.studentid=u.userid
         left join t_class c on ps.classid=c.classid
     </select>
-    <!--识别正确跳过-->
+    <!--识别跳过-->
     <update id="correctSkip">
         UPDATE e_paper_student0608 ps LEFT JOIN e_paper_student ps2 ON ps.epsid=ps2.epsid
-        SET ps.verified=1,ps.samed=1,ps2.verified=1 WHERE ps.epsid=#{epsid}
+        SET ps.verified=#{ps.verified},ps.samed=1,ps2.verified=#{ps.verified} WHERE ps.epid=#{ps.epid} and ps.studentid=#{ps.studentid}
     </update>
 
     <!--获取原试卷中试题正确答案-->