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

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

 import com.xhkjedu.sexam.mapper.paperstudent.EScanbatchMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EScanerrorMapper;
 import com.xhkjedu.sexam.mapper.system.UserMapper;
-import com.xhkjedu.sexam.model.paper.EPaperFile;
 import com.xhkjedu.sexam.model.paper.EPaperQtype;
 import com.xhkjedu.sexam.model.paper.EPaperQtypeQuestion;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
             sq.setChecked(0);
             sq.setStuscore(0.0);
             sq.setCosttime(0);
+            sq.setGood(0);
+            sq.setBad(0);
             psqlist.add(sq);
         }
         ePaperStudentQuestionMapper.insertList(psqlist);//保存试卷

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

 public class EPaperSQuestionVo {
     private Integer epsid;//试卷学生id
     private Integer epsqid;//试卷学生试题id
+    private Integer answertype;//答案类型1选择题、图片2纯文本
     private String stuanswer;//学生答案
+    private String stuanswertxt;//学生答案（纯文本）
     private String qn;//试题题号
     private Integer eptqid;//试题排序
     private double qscore;//分值

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

     </select>
     <!--随机获取一条待批阅试题-->
     <select id="getCorrectQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
-        select psq.epsqid,psq.stuanswer,psq.qn,psq.eptqid,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
+        select psq.epsqid,psq.qn,psq.eptqid,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
+        ,psq.answertype,psq.stuanswer,psq.stuanswertxt
         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!=''">
     </update>
     <!--获取上一份批阅试题-->
     <select id="getPreQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
-        select psq.epsqid,psq.stuanswer,psq.qn,psq.eptqid,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
+        select psq.epsqid,psq.qn,psq.eptqid,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
+        ,psq.answertype,psq.stuanswer,psq.stuanswertxt
         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>
         ,checkid=#{psq.checkid},checktime=unix_timestamp()
         ,good=#{psq.good},bad=#{psq.bad}
         <if test="psq.stuanswer!=null and psq.stuanswer!=''">
-            and stuanswer=#{psq.stuanswer}
+            ,stuanswer=#{psq.stuanswer}
         </if>
         where epsqid=#{psq.epsqid}
     </update>

sexam/src/main/resources/mapper/paperstudent/EPaperStudentMapper.xml

     <!--学生进行中考试列表-->
     <select id="listExamPapersForStudent" resultType="java.util.Map">
         select eps.epsid, es.esid,es.examid,es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,
-        e.examname,e.gradeid,e.examtype,ep.epid,ep.ptype
+        e.examname,e.gradeid,e.examtype,ep.epid,ep.ptype,eps.sstate
         from e_paper_student eps left join e_subject es on eps.esid=es.esid
          left join e_paper ep on eps.epid=ep.epid left join e_base e on eps.examid=e.examid
         where e.deleted=1 and e.exammode=1 and eps.studentid=#{studentid} and e.examstate=1 GROUP BY eps.epsid