教师出卷添加条件分页

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperController.java

@@ -1,10 +1,14 @@
 package com.xhkjedu.sexam.controller.paper;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.paper.EPaper;
 import com.xhkjedu.sexam.model.paper.EPaperBack;
 import com.xhkjedu.sexam.service.paper.EPaperService;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.*;
 
@@ -60,9 +64,13 @@ public class EPaperController {
     //教师出卷列表
     @PostMapping("/listt")
     public ResultVo examTeacherPaperList(@RequestBody ESubject subject){
-        N_Utils.validation(new Object[]{subject.getTeacherid(),"教师id",1});
-        List<Map> list = ePaperService.listExamPapersByTeacherid(subject.getTeacherid());
-        return new ResultVo(0,"成功获取教师出卷信息",list);
+        Integer page = subject.getPage();
+        Integer pageSize = subject.getPageSize();
+        N_Utils.validation(new Object[]{subject.getTeacherid(),"教师id",1,page,"显示页码",1,pageSize,"显示条数",1});
+        PageHelper.startPage(page, pageSize);
+        List<Map> rtnlst = ePaperService.listExamPapersByTeacherid(subject.getTeacherid(),subject.getEsstate());
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(rtnlst));
+        return new ResultVo(0,"成功获取教师出卷信息",pageResult);
     }
 
 

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

@@ -1,9 +1,12 @@
 package com.xhkjedu.sexam.controller.paperstudent;
 
-import com.xhkjedu.sexam.model.paper.EPaper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
 import com.xhkjedu.sexam.service.paperstudent.EPaperStudentService;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,8 +32,19 @@ public class EPaperStudentController {
     @PostMapping("/list")
     public ResultVo listExamPapersForStudent(@RequestBody EPaperStudent eps){
         N_Utils.validation(new Object[]{eps.getStudentid(),"学生id",1});
-        List<Map> rtnlst = ePaperStudentService.listExamPaperForStudent(eps);
-        return new ResultVo(0,"成功获取考试列表",rtnlst);
+        if(eps.getSstate() == 1){
+           //进行中
+            List<Map> rtnlst = ePaperStudentService.listExamPaperForStudent(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);
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(rtnlst));
+            return new ResultVo(0,"成功获取考试列表",pageResult);
+        }
     }
 
 

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperMapper.java

@@ -21,7 +21,7 @@ public interface EPaperMapper extends TkMapper<EPaper> {
     List<Map> listExamPapers(@Param("examid") Integer examid);
 
     //教师出卷列表
-    List<Map> listExamPapersByTeacherid(@Param("teacherid") Integer teacherid);
+    List<Map> listExamPapersByTeacherid(@Param("teacherid") Integer teacherid,@Param("esstate") Integer esstate);
 
     //试卷详情
     Map getExamPaperDetailByEsid(@Param("esid") Integer esid);

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -90,7 +90,7 @@ public class EPaperQtypeService {
         }
         //保存后清除试题栏中试题
         userBasketMapper.deleteByUseridAndSubjectid(paper.getCreateid(),espVo.getSubjectid());
-        return new ResultVo(0,"保存成功");
+        return new ResultVo(0,"保存成功",epid);
     }
 
     //设置试卷基本信息
@@ -184,6 +184,7 @@ public class EPaperQtypeService {
                 if(q.getQlevel()==1){
                     q.setQuestionpid("000");
                 }
+                q.setCtype(q.getQctype());
                 queslist.add(q);
             }
 

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperService.java

@@ -81,8 +81,8 @@ public class EPaperService {
     }
 
     //教师出卷列表
-    public List<Map> listExamPapersByTeacherid(Integer teacherid){
-        return ePaperMapper.listExamPapersByTeacherid(teacherid);
+    public List<Map> listExamPapersByTeacherid(Integer teacherid,Integer esstate){
+        return ePaperMapper.listExamPapersByTeacherid(teacherid,esstate);
     }
 
 

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

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description
+ * @Description 学生试卷信息
  * @Author WN
  * Date 2022/7/26 14:00
  **/
@@ -18,6 +18,13 @@ public class EPaperStudentService {
     @Resource
     private EPaperStudentMapper ePaperStudentMapper;
 
+    /**
+     * @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);
     }

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

@@ -20,7 +20,20 @@
         left join e_base e on es.examid=e.examid
         left join t_user u on ep.handleid=u.userid
         left join t_user u2 on es.teacherid=u2.userid
-        where es.teacherid=#{teacherid} order by es.examid desc, es.esid asc
+        where es.teacherid=#{teacherid}
+        <if test="esstate == 1">
+            and es.esstate=1
+        </if>
+        <if test="esstate != 1">
+            and es.esstate!=1
+        </if>
+        group by es.esid
+        <if test="esstate == 1">
+            order by es.sdate desc,es.endtime desc
+        </if>
+        <if test="esstate != 1">
+            order by abs(UNIX_TIMESTAMP(concat(es.sdate,' ',es.begintime))-UNIX_TIMESTAMP())
+        </if>
     </select>
 
     <!--试卷详情-->

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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
@@ -10,19 +10,18 @@
         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}
-        <if test="eps.sstate==1">
-            and e.examstate=1
-        </if>
-        <if test="eps.sstate==2">
-            and e.examstate=2
-        </if>
-        group by es.esid
-        <if test="eps.sstate==1">
-            order by abs(UNIX_TIMESTAMP(concat(es.sdate,' ',es.begintime))-UNIX_TIMESTAMP())
-        </if>
-        <if test="eps.sstate==2 or eps.sstate==0">
-            order by es.sdate desc,es.endtime desc
-        </if>
+        where s.studentid=#{eps.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">
+        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
+        order by e.examdate desc,es.sdate desc,es.begintime desc
+    </select>
+
 </mapper>

sexam/src/test/java/com/xhkjedu/sexam/SexamApplicationTests.java

@@ -14,10 +14,16 @@ import java.util.Map;
 
 @SpringBootTest
 class SexamApplicationTests {
+    @Resource
+    private EPaperQtypeService ePaperQtypeService;
 
     @Test
     void contextLoads() {
-
+        EPaper ePaper = new EPaper();
+        ePaper.setEpid(68);
+        ePaper.setPnum(15);
+        ePaper.setPscore(172.0);
+//        ePaperQtypeService.savePaperAnalyzeForQuestion(ePaper);
     }
 
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionService.java

@@ -335,7 +335,7 @@ public class QuestionService {
         questionDirectorMapper.batchSave(saveQDirs);//保存试题关联章节
 
         //删除试题栏中原题，加入新题
-        userBasketMapper.deleteByQuestioniduid(question.getCreateid(),oldQuestion.getQuestionid());
+       /* userBasketMapper.deleteByQuestioniduid(question.getCreateid(),oldQuestion.getQuestionid());
         TUserBasket ub = new TUserBasket();
         ub.setUserid(question.getCreateid());
         ub.setSubjectid(question.getSubjectid());
@@ -343,7 +343,7 @@ public class QuestionService {
         ub.setQtypename(question.getQtypename());
         ub.setQuestionid(question.getQuestionid());
         ub.setCreatetime(question.getCreatetime());
-        userBasketMapper.insertSelective(ub);//保存新试题进入试题栏
+        userBasketMapper.insertSelective(ub);//保存新试题进入试题栏*/
 
         return question.getQuestionid();
     }