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

src/main/resources/EPaperVerifyMapper.xml

@@ -44,7 +44,11 @@
         left JOIN e_paper_qtype_question pt ON psq.eptqid=pt.eptqid
         left join t_user u on ps.studentid=u.userid
         left join t_class c on ps.classid=c.classid
-        where ps.epsid in (select min(ps.epsid) FROM e_paper_student0608 ps
+        where ps.examid=#{ps.examid} AND ps.epid=#{ps.epid} and ps.verified=#{ps.verified} and ps.sstate!=0
+        <if test="ps.epsid!=null and ps.epsid!=0">and ps.epsid>#{ps.epsid}</if>
+        <if test="ps.classid!=null and ps.classid!=0">and ps.classid=#{ps.classid}</if>
+        <if test="ps.studentid!=null and ps.studentid!=0">and ps.studentid=#{ps.studentid}</if>
+        and ps.epsid in (select min(ps.epsid) FROM e_paper_student0608 ps
         WHERE ps.examid=#{ps.examid} AND ps.epid=#{ps.epid} and ps.verified=#{ps.verified} and ps.sstate!=0
         <if test="ps.epsid!=null and ps.epsid!=0">and ps.epsid>#{ps.epsid}</if>
         <if test="ps.classid!=null and ps.classid!=0">and ps.classid=#{ps.classid}</if>