Merge remote-tracking branch 'cloud-schoolapi/ywx'

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

@@ -73,21 +73,23 @@ public class EBaseService {
             Integer examid = model.getId();
 
             ResultVo vo = saveExam(model, examid);//保存考试基本信息
-            if (vo != null) return vo;
+            if (vo != null) throw new Exception(vo.getMsg());
 
             return new ResultVo(0, "保存成功", examid);
         } catch (Exception e) {
             log.error("发起考试失败", e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return new ResultVo(1, "保存失败");
+            return new ResultVo(1, e.getMessage());
         }
     }
 
     //保存考试基本信息
     private ResultVo saveExam(EBase model, Integer examid) {
         List<Integer> classids = model.getClassids();
-        Integer num = eClassStudentMapper.getNoExamNoNumByClassIds(classids);//根据班级ids获取没有考号学生数量
-        if (num != 0) return new ResultVo(1, "有学生没有考号");
+        if(model.getExammode() == 2) {//线下考试必须有考号
+            Integer num = eClassStudentMapper.getNoExamNoNumByClassIds(classids);//根据班级ids获取没有考号学生数量
+            if (num != 0) return new ResultVo(1, "有学生没有考号");
+        }
         List<EClassStudent> students = eClassStudentMapper.listByClassIds(classids);
         int stuNum = students.stream().distinct().collect(Collectors.toList()).size();
         if (stuNum < students.size()) return new ResultVo(1, "有重复学生");
@@ -303,9 +305,10 @@ public class EBaseService {
     public ResultVo delStu(Integer ecsid) {
         EClassStudent student = eClassStudentMapper.selectByPrimaryKey(ecsid);
         EBaseVo exam = eBaseMapper.getExamStateById(student.getExamid());
-        if (2 == exam.getExamstate()) return new ResultVo(1, "考试已结束禁止操作");
+        if (0 != exam.getExamstate()) return new ResultVo(1, "考试已发布禁止操作");
         int timestamp = N_Utils.getSecondTimestamp() + 30 * 60;
-        if (exam.getBegintime().compareTo(timestamp) != 1) return new ResultVo(1, "开考前30分钟禁止移除学生");
+        Integer begintime = exam.getBegintime();
+        if (begintime != 0 && begintime.compareTo(timestamp) != 1) return new ResultVo(1, "开考前30分钟禁止移除学生");
         eClassStudentMapper.deleteByPrimaryKey(ecsid);
         eClassMapper.updateClassNumByCsId(student.getExamid(), student.getClassid());
         return new ResultVo(0, "移除考试学生成功");

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -334,6 +334,9 @@ public class PaperService {
         //处理答题卡--题型--试题
         List<TPaperQtypeQuestion> ptqs = new ArrayList<>();
         for (TPaperQtype qtype : qtypes) {
+            if("tlt".equals(qtype.getQtypeid())){
+                qtype.setQtypeid(null);
+            }
             List<QuestionVo> questions = qtype.getQuestions();//题型下试题
             qtype.setCreateid(createid);
             qtype.setCreatetime(N_Utils.getSecondTimestamp());

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentService.java

@@ -141,6 +141,8 @@ public class PaperStudentService {
                 q.setMqanswer(mt.getQanswer());
                 q.setMqanalyze(mt.getQanalyze());
                 q.setMqtypename(mt.getQtypename());
+                q.setMhashear(mt.getHashear());
+                q.setMhearfile(mt.getHearfile());
             }
         }
         return list;

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paperstudent/PaperStudentQuestionVo.java

@@ -97,4 +97,8 @@ public class PaperStudentQuestionVo {
     private String mqanswer;//母题答案
     private String mqanalyze;//母题解析
     private String mqtypename;//母题题型名称
+    private Integer mhashear;//母题是否是听力题0不是1是
+    private String mhearfile;//母题听力题文件地址
+    private Integer hashear;//是否是听力题0不是1是
+    private String hearfile;//听力题文件地址
 }

sstudy/src/main/resources/mapper/paper/PaperAnalyzeMapper.xml

@@ -195,6 +195,8 @@
             <result property="complexity" column="complexity"></result>
             <result property="pointname" column="pointname"></result>
             <result property="checkcomm" column="checkcomm"></result>
+            <result property="hashear" column="hashear"></result>
+            <result property="hearfile" column="hearfile"></result>
         </collection>
     </resultMap>
     <!--作业统计 按人详情 题型列表-->
@@ -202,7 +204,7 @@
         SELECT t.qtypename,t.ptorder,t.ptscore,t.ptnum
         ,psq.psqid,psq.paperid,psq.studentid,psq.answered,psq.answertime,psq.costtime,psq.device,psq.checkcomm
         ,psq.useranswer,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore,psq.stuscore,psq.qorder,psq.psid
-        ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity
+        ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.hashear,q.hearfile
         FROM t_paper_student_question psq LEFT JOIN t_question q ON psq.questionid=q.questionid
         LEFT JOIN t_paper_qtype_question tq ON psq.questionid=tq.questionid AND psq.paperid=tq.paperid
         LEFT JOIN t_paper_qtype t ON tq.ptid=t.ptid

sstudy/src/main/resources/mapper/paper/PaperMapper.xml

@@ -18,12 +18,15 @@
             <result property="qoption" column="qoption"></result>
             <result property="qanswer" column="qanswer"></result>
             <result property="qanalyze" column="qanalyze"></result>
+            <result property="hashear" column="hashear"></result>
+            <result property="hearfile" column="hearfile"></result>
         </collection>
     </resultMap>
     <!--获取作业题型列表-->
     <select id="listPaperType" resultMap="typeResult">
         select pt.qtypeid,pt.qtypename,pt.ptorder,pt.ptscore,pt.ptnum,ptq.questionid,ptq.ptqscore score,ptq.ptqorder
         ,q.questionid,ifnull(q.questionpid,q.questionid)questionpid,q.qlevel,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze
+        ,q.hashear,q.hearfile
         from t_paper_qtype pt left join t_paper_qtype_question ptq on pt.ptid = ptq.ptid
         left join t_question q on ptq.questionid = q.questionid
         where pt.paperid=#{paperid} order by pt.ptorder,ptq.ptqid
@@ -272,7 +275,7 @@
     </select>
     <!--作业母题列表-->
     <select id="listQuestionByQuestionIds" resultType="com.xhkjedu.sstudy.vo.question.QuestionVo">
-        select questionid,ctype,qstem,qoption,qanswer,qanalyze
+        select questionid,ctype,qstem,qoption,qanswer,qanalyze,q.hashear,q.hearfile
         from t_question q where questionid in
         <foreach collection="questionids" item="questionid" open="(" separator="," close=")">
             #{questionid}

sstudy/src/main/resources/mapper/paperstudent/PaperStudentQuestionMapper.xml

@@ -5,11 +5,12 @@
     <select id="getPaperQuestion" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo">
         SELECT psq.psqid,psq.paperid,psq.studentid,psq.answered,psq.answertime,psq.costtime,psq.device,psq.checkcomm
         ,psq.useranswer,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore,psq.stuscore,psq.qorder,u.username studentname,psq.psid
-        ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.qtypename
+        ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.qtypename,q.hashear,q.hearfile
         ,(CASE WHEN psq.checked=1 AND psq.stuscore=psq.qscore THEN 1 ELSE 2 END)corrected
         ,(CASE WHEN q.ctype IN(16,17) THEN JSON_LENGTH(q.qoption) ELSE 0 END)qoptioncount
         ,(CASE WHEN q.questionpid IS NULL THEN ''
-        ELSE (SELECT json_object('qstem',fq.qstem,'qoption',fq.qoption,'qanswer',fq.qanswer,'qanalyze',fq.qanalyze,'qtypename',fq.qtypename)
+        ELSE (SELECT json_object('qstem',fq.qstem,'qoption',fq.qoption,'qanswer',fq.qanswer,'qanalyze',fq.qanalyze
+            ,'qtypename',fq.qtypename,'hashear',fq.hashear,'hearfile',fq.hearfile)
         FROM t_question fq WHERE fq.questionid=q.questionpid) END)mqstem
         FROM t_paper_student_question psq LEFT JOIN t_question q ON psq.questionid=q.questionid
         LEFT JOIN t_user u ON psq.studentid=u.userid

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

@@ -287,7 +287,7 @@
 
     <select id="listSonQuestionForSelect" resultType="java.util.Map">
         select q.questionid,q.score,q.complexity,q.qstem,q.qoption,q.qanswer,q.qanalyze
-        ,q.qtypeid,q.qtypename,q.ctype,q.qlevel,q.sorder
+        ,q.qtypeid,q.qtypename,q.ctype,q.qlevel,q.sorder,q.hashear,q.hearfile
         from t_question q where q.qlevel=3 and q.questionpid=#{questionid} order by q.sorder
     </select>
     <!--修改试题状态-->