完善学生考试

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

@@ -35,80 +35,80 @@ public class EPaperStudentController {
 
     //学生考试列表
     @PostMapping("/list")
-    public ResultVo listExamPapersForStudent(@RequestBody EPaperStudent eps){
-        N_Utils.validation(new Object[]{eps.getStudentid(),"学生id",1});
-        if(eps.getSstate() == 1){
-           //进行中
+    public ResultVo listExamPapersForStudent(@RequestBody EPaperStudent eps) {
+        N_Utils.validation(new Object[]{eps.getStudentid(), "学生id", 1});
+        if (eps.getSstate() == 1) {
+            //进行中
             List<Map> rtnlst = ePaperStudentService.listExamPapersForStudent(eps);
-            return new ResultVo(0,"成功获取考试列表",rtnlst);
-        }else{
+            return new ResultVo(0, "成功获取考试列表", rtnlst);
+        } else {
             Integer page = eps.getPage();
             Integer pageSize = eps.getPageSize();
-            N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
+            N_Utils.validation(new Object[]{page, "显示页码", 1, pageSize, "显示条数", 1});
             PageHelper.startPage(page, pageSize);
             List<Map> rtnlst = ePaperStudentService.listExamsEndForStudent(eps);
             PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(rtnlst));
-            return new ResultVo(0,"成功获取考试列表",pageResult);
+            return new ResultVo(0, "成功获取考试列表", pageResult);
         }
     }
 
     //学生开始考试(android)
     @PostMapping("/spa")
-    public ResultVo startPaperForAndroid(@RequestBody EPaperStudent eps){
-        N_Utils.validation(new Object[]{eps.getEpsid(),"学生试卷id",1});
+    public ResultVo startPaperForAndroid(@RequestBody EPaperStudent eps) {
+        N_Utils.validation(new Object[]{eps.getEpsid(), "学生试卷id", 1});
         List<Map> list = ePaperStudentService.startPaperForAndroid(eps);
-        return new ResultVo(0,"成功获取学生试卷",list);
+        return new ResultVo(0, "成功获取学生试卷", list);
     }
+
     //学生开始考试(web)
     @PostMapping("/spw")
-    public ResultVo startPaperForWeb(@RequestBody EPaperStudent eps){
-        N_Utils.validation(new Object[]{eps.getEpsid(),"学生试卷id",1});
+    public ResultVo startPaperForWeb(@RequestBody EPaperStudent eps) {
+        N_Utils.validation(new Object[]{eps.getEpsid(), "学生试卷id", 1});
         EPaperStudentVo psvo = ePaperStudentService.startPaperForWeb(eps);
-        return new ResultVo(0,"成功获取学生试卷",psvo);
+        return new ResultVo(0, "成功获取学生试卷", psvo);
     }
 
     //提交单题
     @PostMapping("/scq")
-    public ResultVo saveCommitQuestion(@RequestBody EPaperStudentQuestion sq){
-       try {
-           N_Utils.validation(new Object[]{sq.getEpsqid(),"试题id",1});
-           ePaperStudentService.saveCommitQuestion(sq);
-           return new ResultVo(0,"成功提交试题");
-       }catch (Exception e){
-           return new ResultVo(1,"提交试题失败");
-       }
+    public ResultVo saveCommitQuestion(@RequestBody EPaperStudentQuestion sq) {
+        try {
+            N_Utils.validation(new Object[]{sq.getEpsqid(), "试题id", 1});
+            ePaperStudentService.saveCommitQuestion(sq);
+            return new ResultVo(0, "成功提交试题");
+        } catch (Exception e) {
+            return new ResultVo(1, "提交试题失败");
+        }
     }
+
     //提交试卷
     @PostMapping("/scp")
-    public ResultVo saveCommitPaper(@RequestBody EPaperStudent ps){
+    public ResultVo saveCommitPaper(@RequestBody EPaperStudent ps) {
         try {
-            N_Utils.validation(new Object[]{ps.getEpsid(),"试卷id",1});
+            N_Utils.validation(new Object[]{ps.getEpsid(), "试卷id", 1});
             ePaperStudentService.saveCommitPaper(ps.getEpsid());
-            return new ResultVo(0,"成功提交试卷");
-        }catch (Exception e){
-            log.error("提交试卷失败："+e.getMessage());
-            return new ResultVo(1,"提交失败");
+            return new ResultVo(0, "成功提交试卷");
+        } catch (Exception e) {
+            log.error("提交试卷失败：" + e.getMessage());
+            return new ResultVo(1, "提交失败");
         }
     }
 
     //提交试卷--网页端
     @PostMapping("/scpw")
-    public ResultVo saveCommitPaperWeb(@RequestBody PaperStudentWebVo ps){
+    public ResultVo saveCommitPaperWeb(@RequestBody PaperStudentWebVo ps) {
         try {
-            N_Utils.validation(new Object[]{ps.getEpsid(),"试卷id",1});
+            N_Utils.validation(new Object[]{ps.getEpsid(), "试卷id", 1});
             List<EPaperStudentQuestion> qlist = ps.getQuestions();
-            if(N_Utils.isListEmpty(qlist)){
-                return new ResultVo(1,"试题");
+            if (N_Utils.isListEmpty(qlist)) {
+                return new ResultVo(1, "试题");
             }
             ePaperStudentService.saveCommitPaperForWeb(ps);
-            return new ResultVo(0,"成功提交试卷");
-        }catch (Exception e){
-            log.error("提交试卷(web)失败："+e.getMessage());
-            return new ResultVo(1,"提交失败");
+            return new ResultVo(0, "成功提交试卷");
+        } catch (Exception e) {
+            log.error("提交试卷(web)失败：" + e.getMessage());
+            return new ResultVo(1, "提交失败");
         }
     }
 
 
-
-
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paper/EPaperQtype.java

@@ -8,6 +8,7 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @Table(name = "e_paper_qtype")
 @Data
@@ -43,4 +44,7 @@ public class EPaperQtype extends BaseBean {
     //试题集合
     @Transient
     private List<EPaperQtypeQuestion> questions = new ArrayList<>();
+
+    @Transient
+    private List<Map> queslist = new ArrayList<>();
 }

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

@@ -121,6 +121,7 @@ public class EPaperStudentService {
             sq.setConverted(0);
             sq.setChecked(0);
             sq.setStuscore(0.0);
+            sq.setCosttime(0);
             psqlist.add(sq);
         }
         ePaperStudentQuestionMapper.insertList(psqlist);//保存试卷

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

@@ -100,4 +100,6 @@ public class EPaperQtypeQuestionVo {
     //子题集合
     private List<EPaperQtypeQuestionVo> sonques;
 
+    private Integer eqspid;
+
 }

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

@@ -61,7 +61,7 @@
     </select>
     <!--学生试卷附件（android）-->
     <select id="listStuPaperFjQuestionsForAndroid" resultType="java.util.Map">
-        select distinct psq.epsqid,psq.questionid,psq.qn,psq.qorder,psq.answered,psq.ansertype,psq.stuanswer,
+        select distinct psq.epsqid,psq.questionid,psq.qn,psq.qorder,psq.answered,psq.answertype,psq.stuanswer,
         psq.stuanswertxt,psq.eptqid,pq.score,pq.optionnum,pq.ctype,pq.qtypeid,pq.qtypename
         from e_paper_student_question psq left join e_paper_qtype_question pq on psq.eptqid=pq.eptqid
         where psq.epsid=#{epsid} order by psq.qorder
@@ -74,13 +74,13 @@
         <result column="eptnum" property="eptnum"></result>
         <result column="eptorder" property="eptorder"></result>
         <result column="eptscore" property="eptscore"></result>
-        <collection property="questions" ofType="com.xhkjedu.sexam.vo.paper.EPaperQtypeQuestionVo" javaType="java.util.List">
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
             <result column="epsqid" property="epsqid"></result>
             <result column="questionid" property="questionid"></result>
             <result column="qscore" property="qscore"></result>
             <result column="qorder" property="qorder"></result>
             <result column="answered" property="answered"></result>
-            <result column="ansertype" property="ansertype"></result>
+            <result column="answertype" property="answertype"></result>
             <result column="stuanswer" property="stuanswer"></result>
             <result column="stuanswertxt" property="stuanswertxt"></result>
             <result column="eptqid" property="eptqid"></result>
@@ -106,12 +106,12 @@
     <!--学生试卷题库（web）-->
     <select id="listStuPaperQuestionsForWeb" resultMap="qtypesQuestion">
         select pt.eptid,pt.ctype,pt.eptname,pt.eptnum,pt.eptorder,pt.eptscore,
-               psq.epsqid,psq.questionid,psq.qorder,psq.qscore,psq.answered,psq.ansertype,psq.stuanswer,
+               psq.epsqid,psq.questionid,psq.qorder,psq.qscore,psq.answered,psq.answertype,psq.stuanswer,
                psq.stuanswertxt,psq.eptqid,q.qstem,q.qoption,q.ctype qctype,q.hearfile,q.qtypeid,
                q.qtypename,q.qlevel,q.snum,q.sorder,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,
                mq.qoption mqoption,mq.ctype mctype,mq.qtypeid mqtypeid,mq.qtypename mqtypename
-        from e_paper_student_question psq
-        left join e_paper_qtype pt on psq.epid=pt.epid
+        from e_paper_student_question psq left join e_paper_qtype_question ptq on psq.eptqid=ptq.eptqid
+        left join e_paper_qtype pt on pt.eptid=ptq.eptid
         left join t_question q on psq.questionid=q.questionid
         left join t_question mq on q.questionpid=mq.questionid
         where psq.epsid=#{epsid} order by pt.eptorder,psq.qorder
@@ -135,7 +135,7 @@
             <result column="qctype" property="qctype"></result>
             <result column="optionnum" property="optionnum"></result>
             <result column="answered" property="answered"></result>
-            <result column="ansertype" property="ansertype"></result>
+            <result column="answertype" property="answertype"></result>
             <result column="stuanswer" property="stuanswer"></result>
             <result column="stuanswertxt" property="stuanswertxt"></result>
         </collection>
@@ -143,10 +143,10 @@
     <!--学生试卷附件（web）-->
     <select id="listStuPaperFjQuestionsForWeb" resultMap="fjtypeQuestions">
         select pt.eptid,pt.ctype,pt.eptname,pt.eptnum,pt.eptorder,pt.eptscore,
-               psq.epsqid,psq.qn,psq.qorder,psq.answered,psq.ansertype,psq.stuanswer,
+               psq.epsqid,psq.qn,psq.qorder,psq.answered,psq.answertype,psq.stuanswer,
                psq.stuanswertxt,psq.eptqid,psq.qscore score,pq.optionnum,pq.ctype qctype,pq.qtypeid,pq.qtypename
         from e_paper_student_question psq left join e_paper_qtype_question pq on psq.eptqid=pq.eptqid
-        left join e_paper_qtype pt on psq.epid=pt.epid
+        left join e_paper_qtype pt on pq.eptid=pt.eptid
         where psq.epsid=#{epsid} order by pt.eptorder, psq.qorder
     </select>
 

sstudy/src/main/java/com/xhkjedu/sstudy/vo/question/SelectQuestionVo.java

@@ -40,6 +40,9 @@ public class SelectQuestionVo {
     //处理题型1单选题2多选题3主观题4判断对错5判断✔6判断TF7完形填空8阅读理解
     private Integer ctype;
 
+    //试题类型1单体2母题3子题
+    private Integer qlevel;
+
     //资源归属1平台1区平台3学校4个人(搜索时5我的收藏 6我的上传)
     private Integer belong;
 

sstudy/src/main/resources/mapper/question/QuestionMapper.xml

@@ -188,7 +188,7 @@
     <select id="listForSelect" resultType="com.xhkjedu.sstudy.vo.question.SelectQuestionVo">
         select q.questionid,q.score,q.complexity,q.qstem,q.qoption,q.qanswer,q.qanalyze
         ,q.qtypeid,q.qtypename,q.count,GROUP_CONCAT(p.pointname)points,q.ctype,q.belong,q.createid
-        ,q.source,q.year,q.region,q.schoolname
+        ,q.source,q.year,q.region,q.schoolname,q.qlevel
         from t_question q left join t_question_point qp on q.questionid = qp.questionid
         left join t_point p on p.pointid=qp.pointid
         left join t_question_director qd on q.questionid=qd.questionid
@@ -196,6 +196,24 @@
             left join t_question_collect qc on q.questionid = qc.questionid
         </if>
         where q.qstate=1
+        <if test="question.lsbid!=null and question.lsbid!='0'.toString() and question.lsbid!=''">
+            and qd.lsbid=#{question.lsbid}
+        </if>
+        <if test="question.directorid!=null and question.directorid!='0'.toString() and question.directorid!=''">
+            and qd.directorid=#{question.directorid}
+        </if>
+        <if test="question.subjectid!=null and question.subjectid!='0'.toString() and question.subjectid!=''">
+            and q.subjectid=#{question.subjectid}
+        </if>
+        <if test="question.pointid!=null and question.pointid!='0'.toString() and question.pointid!=''">
+            and qp.pointid=#{question.pointid}
+        </if>
+        <if test="question.qtypeid!=null and question.qtypeid!='0'.toString() and question.qtypeid!=''">
+            and q.qtypeid=#{question.qtypeid}
+        </if>
+        <if test="question.complexity!=null and question.complexity!=0">
+            and q.complexity=#{question.complexity}
+        </if>
         <if test="question.belong==0">
             and (q.belong in(1,2)
             <if test="question.schoolid!=null">
@@ -215,24 +233,6 @@
         <if test="question.belong==3">
             and q.schoolid=#{question.schoolid}
         </if>
-        <if test="question.lsbid!=null and question.lsbid!='0'.toString() and question.lsbid!=''">
-            and qd.lsbid=#{question.lsbid}
-        </if>
-        <if test="question.directorid!=null and question.directorid!='0'.toString() and question.directorid!=''">
-            and qd.directorid=#{question.directorid}
-        </if>
-        <if test="question.subjectid!=null and question.subjectid!='0'.toString() and question.subjectid!=''">
-            and q.subjectid=#{question.subjectid}
-        </if>
-        <if test="question.pointid!=null and question.pointid!='0'.toString() and question.pointid!=''">
-            and qp.pointid=#{question.pointid}
-        </if>
-        <if test="question.qtypeid!=null and question.qtypeid!='0'.toString() and question.qtypeid!=''">
-            and q.qtypeid=#{question.qtypeid}
-        </if>
-        <if test="question.complexity!=null and question.complexity!=0">
-            and q.complexity=#{question.complexity}
-        </if>
         <if test="question.belong!=null and question.belong!=0">
             <if test="question.belong==4 or question.belong==6">
                 and q.createid=#{question.createid}
@@ -241,6 +241,7 @@
                 and qc.userid=#{question.createid}
             </if>
         </if>
+        and q.qlevel &lt; 3
         group by q.questionid order by q.createtime desc
     </select>
     <!--修改试题状态-->