学生端考试列表已结束

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPaperStudentController.java

@@ -34,14 +34,14 @@ public class EPaperStudentController {
         N_Utils.validation(new Object[]{eps.getStudentid(),"学生id",1});
         if(eps.getSstate() == 1){
            //进行中
-            List<Map> rtnlst = ePaperStudentService.listExamPaperForStudent(eps);
+            List<Map> rtnlst = ePaperStudentService.listExamPapersForStudent(eps);
             return new ResultVo(0,"成功获取考试列表",rtnlst);
         }else{
             Integer page = eps.getPage();
             Integer pageSize = eps.getPageSize();
             N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
             PageHelper.startPage(page, pageSize);
-            List<Map> rtnlst = ePaperStudentService.listExamPaperForStudent(eps);
+            List<Map> rtnlst = ePaperStudentService.listExamsEndForStudent(eps);
             PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(rtnlst));
             return new ResultVo(0,"成功获取考试列表",pageResult);
         }

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

@@ -17,6 +17,9 @@ import java.util.Map;
 @Repository
 public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
 
-    //学生考试列表
-    List<Map> listExamPaperForStudent(@Param("eps")EPaperStudent eps);
+    //学生进行中考试列表
+    List<Map> listExamPapersForStudent(@Param("studentid")Integer studentid);
+
+    //学生已结束考试列表
+    List<Map> listExamsEndForStudent(@Param("studentid")Integer studentid);
 }

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

@@ -19,14 +19,38 @@ public class EPaperStudentService {
     private EPaperStudentMapper ePaperStudentMapper;
 
     /**
-     * @Description  学生试卷列表
+     * @Description  学生进行中考试列表
      * @Param [eps]
      * @Return java.util.List<java.util.Map>
      * @Author wn
      * @Date 2022/7/27 10:35
      **/
-    public List<Map> listExamPaperForStudent(EPaperStudent eps){
-        return ePaperStudentMapper.listExamPaperForStudent(eps);
+    public List<Map> listExamPapersForStudent(EPaperStudent eps){
+        return ePaperStudentMapper.listExamPapersForStudent(eps.getStudentid());
+    }
+
+    /** 学生已结束考试列表
+     * @Description
+     * @Param [eps]
+     * @Return java.util.List<java.util.Map>
+     * @Author wn
+     * @Date 2022/7/27 11:34
+     **/
+    public List<Map> listExamsEndForStudent(EPaperStudent eps){
+        return ePaperStudentMapper.listExamsEndForStudent(eps.getStudentid());
+    }
+
+    /**
+     * @Description 开始考试
+     * @Param [eps]
+     * @Return java.util.Map
+     * @Author wn
+     * @Date 2022/7/27 11:48
+     **/
+    public Map startPaper(EPaperStudent eps){
+
+        Map map = null;
+        return map;
     }
 
 }

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

@@ -15,7 +15,7 @@
     <!--教师出卷列表-->
     <select id="listExamPapersByTeacherid" resultType="java.util.Map">
         select es.esid,es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,es.teacherid,u2.username as teachername,es.esstate
-        ,ep.epid,ep.ptype,ep.pnum,ep.pscore,ep.answered,ep.handleid,u.username as handlename,es.examid,e.examname,e.examtype
+        ,ep.epid,ep.ptype,ep.pnum,ep.pscore,ep.answered,ep.handleid,u.username as handlename,es.examid,e.examname,e.examtype,e.exammode
         from e_subject es left join e_paper ep on es.esid=ep.esid
         left join e_base e on es.examid=e.examid
         left join t_user u on ep.handleid=u.userid

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

@@ -3,24 +3,39 @@
 <mapper namespace="com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper">
 
     <!--学生进行中考试列表-->
-    <select id="listExamPaperForStudent" resultType="java.util.Map">
-        select es.esid,es.examid,es.subjectid,ts.subjectname,es.sdate,es.begintime,es.endtime,
-               e.examname,e.gradeid,e.examtype,ep.epid
-        from e_subject es left join e_paper ep on es.esid=ep.esid
-        left join e_base e on es.examid=e.examid
-        left join e_class_student s on es.examid=s.examid
-        left join t_subject ts on es.subjectid=ts.subjectid
-        where s.studentid=#{eps.studentid} and e.examstate=1
+    <select id="listExamPapersForStudent" resultType="java.util.Map">
+        select es.esid,es.examid,es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,
+        e.examname,e.gradeid,e.examtype,ep.epid
+        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 eps.studentid=#{studentid} and e.examstate=1
         order by abs(UNIX_TIMESTAMP(concat(es.sdate,' ',es.begintime))-UNIX_TIMESTAMP())
     </select>
 
-    <!--学生及已结束考试-->
-    <select id="listExamsForStudent" resultType="java.util.Map">
+    <resultMap id="examsEndForStu" type="java.util.Map">
+        <result property="examid" column="examid"></result>
+        <result property="examname" column="examname"></result>
+        <result property="examdate" column="examdate"></result>
+        <result property="gradeid" column="gradeid"></result>
+        <result property="examtype" column="examtype"></result>
+        <result property="exammode" column="exammode"></result>
+        <result property="examcomm" column="examcomm"></result>
+        <collection property="subjects" ofType="java.util.Map" javaType="java.util.List">
+            <result property="esid" column="esid"></result>
+            <result property="subjectid" column="subjectid"></result>
+            <result property="subjectname" column="subjectname"></result>
+            <result property="sdate" column="sdate"></result>
+            <result property="begintime" column="begintime"></result>
+            <result property="endtime" column="endtime"></result>
+        </collection>
+    </resultMap>
+    <!--学生已结束考试列表-->
+    <select id="listExamsEndForStudent" resultMap="examsEndForStu">
         select e.examid,e.examname,e.examdate,e.gradeid,e.examtype,e.exammode,e.examcomm,
                es.esid,es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime
         from e_subject es left join e_base e on es.examid=e.examid
                           left join e_class_student cs on es.examid=cs.examid
-        where cs.studentid=14 and e.examstate=0 group by es.esid
+        where cs.studentid=#{studentid} and e.examstate=2 group by es.esid
         order by e.examdate desc,es.sdate desc,es.begintime desc
     </select>