学生开始考试，提交试卷、试题去除考试状态限制

sapi/src/main/resources/mapper/itemtool/StudentTodoMapper.xml

@@ -151,7 +151,7 @@
                 select 'exam' todotype,count(distinct eps.epsid)num,#{todo.subjectid} subjectid
                 from e_paper_student eps left join e_subject es on eps.esid=es.esid
                 left join e_base e on eps.examid=e.examid
-                where e.deleted=1 and e.exammode=1 and eps.studentid=#{todo.studentid} and e.examstate=1
+                where e.deleted=1 and e.exammode=1 and eps.studentid=#{todo.studentid} and e.examstate>=1
                 and es.pstate!=2 and eps.sstate=0
                 <if test="todo.showtime!=null and todo.showtime!=0">
                     and UNIX_TIMESTAMP(concat(es.sdate,' ',es.begintime))>=#{todo.showtime}

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPaperStudentMapper.java

@@ -114,4 +114,7 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
 
     //获取学生考试结束时间戳
     EPaperStudent getEndTime(@Param("esid") Integer esid,@Param("studentid") Integer studentid);
+
+    //根据试卷学生id获取考试科目状态
+    Integer getSubjectStateByEpsid(@Param("epsid") Integer epsid);
 }

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

@@ -108,10 +108,8 @@ public class EPaperStudentService {
        /* Integer examstate = ePaperStudentMapper.getExamStateByEpsId(epsid);
         if (2 <= examstate) throw new MissingParametersException("考试已结束禁止操作");*/
 
-        Map mapstate = ePaperStudentMapper.getExamStateSubjectStateByEpsid(epsid);
-        Integer examstate = Integer.parseInt(mapstate.get("examstate").toString());
-        Integer pstate = Integer.parseInt(mapstate.get("pstate").toString());
-        if(examstate >= 2 || pstate == 2) throw new MissingParametersException("考试已结束禁止操作");
+        Integer pstate = ePaperStudentMapper.getSubjectStateByEpsid(epsid);
+        if(pstate == 2) throw new MissingParametersException("考试已结束禁止操作");
 
         Map map = new HashMap();
         //获取试卷基本信息
@@ -172,11 +170,10 @@ public class EPaperStudentService {
     public Integer getExamstateSubjectState(Integer epsid){
         Integer rtnresult = 1;
         Map mapstate = ePaperStudentMapper.getExamStateSubjectStateByEpsid(epsid);
-        Integer examstate = Integer.parseInt(mapstate.get("examstate").toString());
         Integer pstate = Integer.parseInt(mapstate.get("pstate").toString());
         String begintime = mapstate.get("begintime").toString();
         String sdate = mapstate.get("sdate").toString();
-        if(examstate >= 2 || pstate == 2){
+        if(pstate == 2){
             rtnresult = 2;//考试已结束
         }else{
             String beginstr = sdate + " " + begintime + ":00";
@@ -210,10 +207,8 @@ public class EPaperStudentService {
         Integer epsid = eps.getEpsid();
 //        Integer examstate = ePaperStudentMapper.getExamStateByEpsId(epsid);
 //        if (2 <= examstate) throw new MissingParametersException("考试已结束禁止操作");
-        Map mapstate = ePaperStudentMapper.getExamStateSubjectStateByEpsid(epsid);
-        Integer examstate = Integer.parseInt(mapstate.get("examstate").toString());
-        Integer pstate = Integer.parseInt(mapstate.get("pstate").toString());
-        if(examstate >= 2 || pstate == 2) throw new MissingParametersException("考试已结束禁止操作");
+        Integer pstate = ePaperStudentMapper.getSubjectStateByEpsid(epsid);
+        if(pstate == 2) throw new MissingParametersException("考试已结束禁止操作");
 
         //获取试卷基本信息
         EPaperStudentVo psvo = ePaperStudentMapper.getExamSubjectByEpsid(epsid);
@@ -365,10 +360,8 @@ public class EPaperStudentService {
        /* Integer examstate = ePaperStudentMapper.getExamStateByEpsId(epsid);
         if (2 <= examstate) throw new MissingParametersException("考试已结束禁止操作");*/
         Integer epsid = paperStudent.getEpsid();
-        Map mapstate = ePaperStudentMapper.getExamStateSubjectStateByEpsid(epsid);
-        Integer examstate = Integer.parseInt(mapstate.get("examstate").toString());
-        Integer pstate = Integer.parseInt(mapstate.get("pstate").toString());
-        if(examstate >= 2 || pstate == 2){
+        Integer pstate = ePaperStudentMapper.getSubjectStateByEpsid(epsid);
+        if(pstate == 2){
             return new ResultVo(0,"考试已结束");
         }
         /*EPaperStudent ps = ePaperStudentMapper.selectByPrimaryKey(epsid);
@@ -441,10 +434,8 @@ public class EPaperStudentService {
     public ResultVo saveCommitPaperForWeb(PaperStudentWebVo pswvo) {
         /*Integer examstate = ePaperStudentMapper.getExamStateByEpsId(pswvo.getEpsid());
         if (2 <= examstate) throw new MissingParametersException("考试已结束禁止操作");*/
-        Map mapstate = ePaperStudentMapper.getExamStateSubjectStateByEpsid(pswvo.getEpsid());
-        Integer examstate = Integer.parseInt(mapstate.get("examstate").toString());
-        Integer pstate = Integer.parseInt(mapstate.get("pstate").toString());
-        if(examstate >= 2 || pstate == 2) {
+        Integer pstate = ePaperStudentMapper.getSubjectStateByEpsid(pswvo.getEpsid());
+        if(pstate == 2) {
             return new ResultVo(0,"考试已结束");
         }
         List<EPaperStudentQuestion> sqlist = pswvo.getQuestions();//学生提交试卷中试题
@@ -746,10 +737,8 @@ public class EPaperStudentService {
     public void updateSstate(Integer epsid, Integer sstate) {
         /*Integer examstate = ePaperStudentMapper.getExamStateByEpsId(epsid);
         if (2 <= examstate) throw new MissingParametersException("考试已结束禁止操作");*/
-        Map mapstate = ePaperStudentMapper.getExamStateSubjectStateByEpsid(epsid);
-        Integer examstate = Integer.parseInt(mapstate.get("examstate").toString());
-        Integer pstate = Integer.parseInt(mapstate.get("pstate").toString());
-        if(examstate >= 2 || pstate == 2) throw new MissingParametersException("考试已结束禁止操作");
+        Integer pstate = ePaperStudentMapper.getSubjectStateByEpsid(epsid);
+        if(pstate == 2) throw new MissingParametersException("考试已结束禁止操作");
 
         ePaperStudentMapper.updateSstate(epsid, sstate);
     }

sexam/src/main/resources/mapper/exam/ESubjectMapper.xml

@@ -109,7 +109,7 @@
     <update id="startPaper">
         update e_base eb left join e_subject es on eb.examid = es.examid
         set es.pstate=1
-        where eb.examstate=1 and eb.deleted=1 and eb.exammode=1
+        where eb.examstate>=1 and eb.deleted=1 and eb.exammode=1
         and es.pstate=0 and concat(es.sdate,' ',es.begintime)&lt;=now()
     </update>
     <!--试卷结束考试-->
@@ -118,7 +118,7 @@
         left join e_paper_student eps on es.esid=eps.esid and eps.sstate in(0,1)
         set es.pstate=2,eps.sstate=(case when eps.sstate=0 then 3 else 2 end)
         ,eps.endtime=(case when eps.sstate=1 then unix_timestamp() else eps.endtime end)
-        where eb.examstate=1 and eb.deleted=1 and eb.exammode=1
+        where eb.examstate>=1 and eb.deleted=1 and eb.exammode=1
         and es.pstate=1 and unix_timestamp(concat(es.sdate,' ',es.endtime))+300 &lt;unix_timestamp()
     </update>
 </mapper>

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

@@ -338,6 +338,10 @@
         left join e_base b on b.examid = eps.examid left join e_subject s on eps.esid=s.esid
         where eps.epsid=#{epsid}
     </select>
+    <!--根据试卷学生id获取考试科目状态-->
+    <select id="getSubjectStateByEpsid" resultType="java.lang.Integer">
+        select s.pstate from e_paper_student eps left join e_subject s on eps.esid=s.esid where eps.epsid=#{epsid}
+    </select>
     <!--缺考详情-->
     <select id="listQkDetail" resultType="java.util.Map">
         select ec.classid,ec.classname,ec.classnum
@@ -350,7 +354,7 @@
     <!--当天进行中考试列表-->
     <select id="listExam" resultType="java.util.Map">
         SELECT b.examname,s.* FROM e_subject s LEFT JOIN e_base b ON s.examid=b.examid
-        WHERE s.sdate=DATE_FORMAT(now(),'%Y-%m-%d') AND b.examstate=1 and s.pstate=1
+        WHERE s.sdate=DATE_FORMAT(now(),'%Y-%m-%d') AND b.examstate>=1 and s.pstate=1
     </select>
     <!--更新当天进行中考试已提交的学生状态为已进场-->
     <update id="updateSstateByEsIds">