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

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/question/QuestionMapper.java

      * @Date 2022/7/25 16:55
      **/
     void saveBathQuestion(@Param("list") List<TQuestion> list);
+
+    //获取科目下听力题数量
+    Integer getQuestionHasHearNum(@Param("subjectid")String subjectid);
 }

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

         question.setCreatetime(timestamp);
         String questionid = StudyUtil.getId();
         question.setQuestionid(questionid);
+
+        if(question.getHashear() == null){
+            question.setHashear(0);
+        }
+
         saveQues.add(question);
         map.put("questionid",questionid);
 

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

 
 import com.xhkjedu.sstudy.mapper.question.QuestionMapper;
 import com.xhkjedu.sstudy.mapper.question.UserBasketMapper;
+import com.xhkjedu.sstudy.mapper.subjectbook.SubjectMapper;
 import com.xhkjedu.sstudy.model.question.TUserBasket;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.sstudy.vo.question.QuestionVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
     private UserBasketMapper userBasketMapper;
     @Resource
     private QuestionMapper questionMapper;
+    @Resource
+    private SubjectMapper subjectMapper;
 
     //添加
     public Integer save(TUserBasket model) {
     //获取列表
     public List <UserBasketVo> findAll(Integer userid, String subjectid) {
         List<UserBasketVo> baskets = userBasketMapper.findAll(userid, subjectid);
-        for (UserBasketVo b : baskets) {
-            List<QuestionVo> questions = b.getQuestions();
-            b.setPtnum(questions.size());
-            Double scoretotal = questions.stream().collect(Collectors.summingDouble(QuestionVo::getScore));
-            b.setPtscore(scoretotal);
+        String sujectname = subjectMapper.getSubjectnameById(subjectid);
+        //英语学科时处理听力题
+        if(sujectname.contains("英语")){
+            List<QuestionVo> hearqs  = new ArrayList<>();
+            for (UserBasketVo b : baskets) {
+                List<QuestionVo> questions = b.getQuestions();
+
+                List<QuestionVo> tllist = questions.stream().filter( o -> o.getHashear() ==1).collect(Collectors.toList());
+                if(N_Utils.isNotEmpty(tllist)){
+                    hearqs.addAll(tllist);
+
+                    questions = questions.stream().filter( o -> o.getHashear() ==0).collect(Collectors.toList());
+                }
+                b.setPtnum(questions.size());
+                Double scoretotal = questions.stream().collect(Collectors.summingDouble(QuestionVo::getScore));
+                b.setPtscore(scoretotal);
+                b.setQuestions(questions);
+            }
+
+            if(N_Utils.isNotEmpty(hearqs)){
+                UserBasketVo tlvo = new UserBasketVo();
+                tlvo.setQtypename("听力题");
+                tlvo.setPtnum(hearqs.size());
+                Double scoretotal = hearqs.stream().collect(Collectors.summingDouble(QuestionVo::getScore));
+                tlvo.setPtscore(scoretotal);
+                tlvo.setQuestions(hearqs);
+                baskets.add(0,tlvo);
+
+            }
+        }else{
+            for (UserBasketVo b : baskets) {
+                List<QuestionVo> questions = b.getQuestions();
+                b.setPtnum(questions.size());
+                Double scoretotal = questions.stream().collect(Collectors.summingDouble(QuestionVo::getScore));
+                b.setPtscore(scoretotal);
+            }
         }
         return baskets;
     }

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/SubjectQuestiontypeService.java

 package com.xhkjedu.sstudy.service.subjectbook;
 
+import com.xhkjedu.sstudy.mapper.question.QuestionMapper;
 import com.xhkjedu.sstudy.mapper.subjectbook.SubjectMapper;
 import com.xhkjedu.sstudy.mapper.subjectbook.SubjectQuestiontypeMapper;
 import com.xhkjedu.sstudy.model.subjectbook.TSubjectQuestiontype;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
     private SubjectQuestiontypeMapper subjectQuestiontypeMapper;
     @Autowired
     private SubjectMapper subjectMapper;
+    @Resource
+    private QuestionMapper questionMapper;
 
     /**
      *功能描述 获取科目下所有题型
         String  subjectname = subjectMapper.getSubjectnameById(sqtype.getSubjectid());
         if(subjectname.contains("英语")){
             //如果是英语题获取英语题对应试题包含听力题的题型
-            List<Map> heartypes = subjectQuestiontypeMapper.listQtypesHasHear(sqtype);
-            if(heartypes!=null && heartypes.size()>0){
+//            List<Map> heartypes = subjectQuestiontypeMapper.listQtypesHasHear(sqtype);//获取有听力题的题型
+            Integer hearnum = questionMapper.getQuestionHasHearNum(sqtype.getSubjectid());
+            if(hearnum!=null && hearnum >0){
                 Map tlmap = new HashMap();
                 tlmap.put("qtypename","听力题");
-                tlmap.put("qtypes",heartypes);
                 list.add(0,tlmap);
             }
         }
         return list;
     }
-
-    }
+}

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

         </foreach>
     </insert>
 
+    <!--获取科目下听力题数量-->
+    <select id="getQuestionHasHearNum" resultType="java.lang.Integer">
+        select count(*) from t_question where hashear=1 and qstate=1 and subjectid=#{subjectid}
+    </select>
+
 </mapper>

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

             <result property="count" column="count"></result>
             <result property="qlevel" column="qlevel"></result>
             <result property="snum" column="snum"></result>
+            <result property="hashear" column="hashear"></result>
+            <result property="hearfile" column="hearfile"></result>
             <collection property="points" ofType="com.xhkjedu.sstudy.vo.subjectbook.PointVo">
                 <result property="pointid" column="pointid"></result>
                 <result property="pointname" column="pointname"></result>
     </resultMap>
     <select id="findAll" resultMap="basketResult">
         select ub.*,q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.createtime
-        ,q.count,qp.pointid,p.pointname,q.qlevel,q.snum
+        ,q.count,qp.pointid,p.pointname,q.qlevel,q.snum,q.hashear,q.hearfile
         from t_user_basket ub left join t_subject_questiontype tsq on ub.qtypeid = tsq.qtypeid
         left join t_question q on ub.questionid = q.questionid
         left join t_question_point qp on q.questionid = qp.questionid