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

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

@@ -70,8 +70,8 @@ public class EPaperStudentController {
     @PostMapping("/spa")
     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);
+        Map map = ePaperStudentService.startPaperForAndroid(eps);
+        return new ResultVo(0, "成功获取学生试卷", map);
     }
 
     //提交单题

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

@@ -135,6 +135,7 @@ public class EPaperQtypeService {
         }else{
             paper.setAnswered(0);
         }
+
         if(paper.getHearnum() == null){
             paper.setHearnum(0);
         }
@@ -284,6 +285,7 @@ public class EPaperQtypeService {
                 }else{
                     mq.setMctype(112);
                 }
+
                 mquestions.add(mq);
             }
         }
@@ -489,6 +491,8 @@ public class EPaperQtypeService {
                        mq.setQanswer(q.getMqanswer());
                        mq.setQorder(q.getQorder());
                        mq.setQlevel(q.getMqlevel());
+                       mq.setMhashear(q.getMhashear());
+                       mq.setMhearfile(q.getMhearfile());
                        List<EPaperQPointVo> allpoint = new ArrayList<>();
                        for(EPaperQtypeQuestionVo sq : sonqlist){
                            List<EPaperQPointVo> sqpoints = sq.getPoints();

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

@@ -100,8 +100,9 @@ public class EPaperStudentService {
      * @Author wn
      * @Date 2022/7/27 11:48
      **/
-    public List<Map> startPaperForAndroid(EPaperStudent eps) {
+    public Map startPaperForAndroid(EPaperStudent eps) {
         Integer epsid = eps.getEpsid();
+        Map map = new HashMap();
         //获取试卷基本信息
         EPaperStudentVo psvo = ePaperStudentMapper.getExamSubjectByEpsid(epsid);
         Integer ptype = psvo.getPtype();
@@ -125,8 +126,14 @@ public class EPaperStudentService {
                 questions = ePaperStudentMapper.listStuPaperFjQuestionsForAndroid(epsid);
             }
         }
+        if(ptype == 2){
+            List<Map> files = ePaperFileMapper.listPaperFiles(psvo.getEpid());
+            map.put("files",files);
+        }
 
-        return questions;
+        map.put("paper",psvo);
+        map.put("questions",questions);
+        return map;
     }
 
     //保存学生试卷关联信息

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

@@ -57,6 +57,12 @@ public class EPaperQtypeQuestionVo {
     //难易度
     private Integer complexity;
 
+    //是否是听力题0不是1是
+    private Integer hashear;
+
+    //听力题文件地址
+    private String hearfile;
+
     //试题类型1单体2母题3子题
     private Integer qlevel;
 
@@ -96,6 +102,12 @@ public class EPaperQtypeQuestionVo {
     //母题类型
     private Integer mqlevel;
 
+    //是否是听力题0不是1是
+    private Integer mhashear;
+
+    //听力题文件地址
+    private String mhearfile;
+
     //试题关联知识点
     private List<EPaperQPointVo> points = new ArrayList<>();
 

sexam/src/main/java/com/xhkjedu/sexam/vo/paperstudent/EPaperStudentVo.java

@@ -49,6 +49,8 @@ public class EPaperStudentVo {
 
     private String hearfile;//听力文件
 
+    private Integer hearnum;//听力文件允许播放次数
+
     //试题集合
     private List<EPaperQtype> qtypelist;
 

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

@@ -41,7 +41,7 @@
     <select id="getExamPaperDetailByEsid" resultType="java.util.Map">
         select e.examid,e.examname,e.gradeid,e.examtype,e.exammode,e.examstate,e.monitored,es.esid,
                u2.username teachername,es.sdate,es.esstate,es.begintime,es.endtime,es.subjectid,es.subjectname,ep.epid,
-               ep.ptype,ep.pnum,ep.pscore,ep.answered,ep.hearfile,ep.hasfile,ep.handleid,ep.handletime,u.username as handlename
+               ep.ptype,ep.pnum,ep.pscore,ep.answered,ep.hearnum,ep.hearfile,ep.hasfile,ep.handleid,ep.handletime,u.username as handlename
         from e_base e left join e_subject es on e.examid=es.examid
         left join e_paper ep on es.esid=ep.esid
         left join t_user u on ep.handleid=u.userid

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

@@ -27,6 +27,8 @@
             <result column="qanswer" property="qanswer"></result>
             <result column="qanalyze" property="qanalyze"></result>
             <result column="complexity" property="complexity"></result>
+            <result column="hashear" property="hashear"></result>
+            <result column="hearfile" property="hearfile"></result>
             <result column="qlevel" property="qlevel"></result>
             <result column="sorder" property="sorder"></result>
             <result column="snum" property="snum"></result>
@@ -39,6 +41,8 @@
             <result column="mqanswer" property="mqanswer"></result>
             <result column="mqanalyze" property="mqanalyze"></result>
             <result column="mqlevel" property="mqlevel"></result>
+            <result column="mhashear" property="mhashear"></result>
+            <result column="mhearfile" property="mhearfile"></result>
             <collection property="points" ofType="com.xhkjedu.sexam.vo.paper.EPaperQPointVo" javaType="java.util.List"
                         column="{questionid=questionid,qlevel=qlevel,questionpid=questionpid" select="listQuestionPoints">
                 <result column="pointid" property="pointid"></result>
@@ -50,9 +54,9 @@
     <select id="listPaperQtypeQuestions" resultMap="qtypesQuestion">
         select t.eptid,t.epid,t.ctype,t.eptname,t.eptnum,t.eptorder,t.eptscore,tq.eptqid,tq.questionid,tq.answer,
                tq.score,tq.qn,tq.qorder,q.qtypeid,q.qtypename,q.ctype qctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,
-               q.complexity,q.qlevel,q.sorder,q.questionpid,fq.snum,fq.qstem as mqstem,fq.complexity as mcomplexity,
+               q.complexity,q.hashear,q.hearfile,q.qlevel,q.sorder,q.questionpid,fq.snum,fq.qstem as mqstem,fq.complexity as mcomplexity,
                fq.qtypeid mqtypeid,fq.qtypename mqtypename,fq.ctype mctype,fq.qanalyze mqanalyze,fq.qanswer mqanswer,
-               fq.qlevel mqlevel
+               fq.qlevel mqlevel,fq.hashear mhashear,fq.hearfile mhearfile
         from e_paper_qtype_question tq left join e_paper_qtype t on t.eptid=tq.eptid
         left join t_question q on tq.questionid=q.questionid
         left JOIN t_question fq on q.questionpid=fq.questionid

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

@@ -51,7 +51,7 @@
     <!--考试试卷基本信息-->
     <select id="getExamSubjectByEpsid" resultType="com.xhkjedu.sexam.vo.paperstudent.EPaperStudentVo">
         select ps.epsid,ps.examid,ps.esid,ps.classid,ps.studentid,es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,
-               e.examname,e.gradeid,ps.epid,p.ptype,p.pnum,p.pscore,p.hearfile,s.classname
+               e.examname,e.gradeid,ps.epid,p.ptype,p.pnum,p.pscore,p.hearfile,p.hearnum,s.classname
         from e_paper_student ps left join e_subject es on ps.esid=es.esid
         left join e_base e on ps.examid=e.examid left join e_paper p on ps.epid=p.epid
         left join t_class s on ps.classid=s.classid
@@ -60,9 +60,9 @@
     <!--学生试卷题库（android）-->
     <select id="listStuPaperQuestionsForAndroid" resultType="java.util.Map">
         select distinct psq.epsqid,psq.questionid,psq.qn,psq.qorder,psq.answered,psq.answertype,psq.stuanswer,
-        psq.stuanswertxt,psq.eptqid,pq.score,q.qstem,q.qoption,q.ctype,q.hearfile,q.qtypeid,
+        psq.stuanswertxt,psq.eptqid,pq.score,q.qstem,q.qoption,q.ctype,q.hashear,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
+        mq.qoption mqoption,mq.ctype mctype,mq.qtypeid mqtypeid,mq.qtypename mqtypename,mq.hashear mhashear,mq.hearfile mhearfile
         from e_paper_student_question psq left join e_paper_qtype_question pq on psq.eptqid=pq.eptqid
         left join t_question q on psq.questionid=q.questionid
         left join t_question mq on q.questionpid=mq.questionid