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

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

@@ -527,11 +527,12 @@ public class EPaperStudentService {
     private void setQuestionsForPaper(List<Map> qtypes){
         for(Map mt : qtypes){
             Integer ctype = Integer.parseInt(mt.get("ctype").toString());
+            List<Map> mqlist = new ArrayList<>();
             if(ctype == 11 || ctype == 16 || ctype == 17){
                 //符合题、完形填空、任务型阅读
                 List<Map> questions = (List<Map>) mt.get("questions");
                 Map<String,List<Map>> quemap = questions.stream().collect(Collectors.groupingBy(o -> o.get("questionpid").toString()));
-                List<Map> mqlist = new ArrayList<>();
+
                 for(Map.Entry<String,List<Map>> entry : quemap.entrySet()){
                     List<Map> sonqlst = entry.getValue();
                     Double sontotalsocre = sonqlst.stream().mapToDouble(o -> Double.parseDouble(o.get("score").toString())).sum();
@@ -547,7 +548,9 @@ public class EPaperStudentService {
                     mque.put("qorder",sque.get("qorder").toString());
                     mque.put("qn",sque.get("qn").toString());
                     mque.put("snum",Integer.parseInt(sque.get("snum").toString()));
-                    if(ctype == 12 && sque.get("mhearfile")!=null){
+                    Integer hashear = Integer.parseInt(sque.get("mhashear").toString());
+                    mque.put("hashear",hashear);
+                    if(ctype == 12 && hashear==1){
                         mque.put("hearfile",sque.get("mhearfile").toString());
                     }else{
                         mque.put("hearfile","");
@@ -557,13 +560,9 @@ public class EPaperStudentService {
                     mque.put("stuscore",stuscore);
                     mqlist.add(mque);
                 }
-
-                mt.put("questions",mqlist);
-
             }else if(ctype == 12){
                 //听力题，包含单题和复合题
                 List<Map> questions = (List<Map>) mt.get("questions");
-                List<Map> mqlist = new ArrayList<>();
                 List<String> questionpids = new ArrayList<>();
                 for(Map q : questions){
                     Integer qlevel = Integer.parseInt(q.get("qlevel").toString());
@@ -587,7 +586,9 @@ public class EPaperStudentService {
                             mque.put("qorder",q.get("qorder").toString());
                             mque.put("qn",q.get("qn").toString());
                             mque.put("snum",Integer.parseInt(q.get("snum").toString()));
-                            if(ctype == 12 && q.get("mhearfile")!=null){
+                            Integer hashear = Integer.parseInt(q.get("mhashear").toString());
+                            mque.put("hashear",hashear);
+                            if(ctype == 12 && hashear == 1){
                                 mque.put("hearfile",q.get("mhearfile").toString());
                             }else{
                                 mque.put("hearfile","");
@@ -595,11 +596,16 @@ public class EPaperStudentService {
                             mque.put("score",sontotalsocre);
                             mque.put("stuscore",stuscore);
                             mque.put("sonques",sonques);
+                            mqlist.add(mque);
                         }
                     }
                 }
 
+            }else{
+                List<Map> questions = (List<Map>) mt.get("questions");
+                mqlist.addAll(questions);
             }
+            mt.put("questions",mqlist);
         }
     }
 

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

@@ -161,7 +161,9 @@
             <result column="qtypeid" property="qtypeid"></result>
             <result column="qtypename" property="qtypename"></result>
             <result column="qctype" property="ctype"></result>
-            <result column="qstem" property="qstem"></result>
+            <result column="hashear" property="hashear"></result>
+            <result column="qctype" property="ctype"></result>
+            <result column="hearfile" property="hearfile"></result>
             <result column="qoption" property="qoption"></result>
             <result column="qlevel" property="qlevel"></result>
             <result column="sorder" property="sorder"></result>
@@ -172,15 +174,16 @@
             <result column="mqtypeid" property="mqtypeid"></result>
             <result column="mqtypename" property="mqtypename"></result>
             <result column="mctype" property="mctype"></result>
+            <result column="mhashear" property="mhashear"></result>
             <result column="mhearfile" property="mhearfile"></result>
         </collection>
     </resultMap>
     <select id="listQStuQuestionScore" resultMap="qtypesQuestion">
         select pt.ctype,pt.eptname,pt.eptnum,pt.eptorder,pt.eptscore,
                psq.epsqid,psq.questionid,psq.qorder,psq.qn,ptq.score,ptq.answer,psq.answered,psq.answertype,psq.stuanswer,
-               psq.stuanswertxt,psq.eptqid,psq.stuscore,q.qstem,q.qoption,q.ctype qctype,q.qtypeid,
+               psq.stuanswertxt,psq.eptqid,psq.stuscore,q.qstem,q.qoption,q.ctype qctype,q.qtypeid,q.hashear,q.hearfile,
                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.hearfile mhearfile
+               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 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