优化举一反三试题列表

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

@@ -71,4 +71,10 @@ public interface QuestionClassMapper extends TkMapper<TQuestionClass> {
 
     //根据试题id获取答题卡信息
     QuestionClassVo getScantronById(String questionid);
+
+    //获取试题是否被某人收藏
+    Integer getCollected(String questionid, Integer userid);
+
+    //获取试题关联知识点
+    String getPointName(String questionid);
 }

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

@@ -341,6 +341,14 @@ public class QuestionClassService {
     public List<Map> listJYFSQuestion(String questionid, Integer userid, Integer schoolid) {
         String pointIds = questionClassMapper.getPointIds(questionid);
         if (N_Utils.isEmpty(pointIds)) return new ArrayList<>();
-        return questionClassMapper.listJYFSQuestion(pointIds, questionid, userid, schoolid);
+        List<Map> list = questionClassMapper.listJYFSQuestion(pointIds, questionid, userid, schoolid);
+        for (Map map : list) {
+            questionid = map.get("questionid").toString();
+            Integer collected = questionClassMapper.getCollected(questionid, userid);
+            map.put("collected",collected);
+            String pointname = questionClassMapper.getPointName(questionid);
+            map.put("pointname",pointname);
+        }
+        return list;
     }
 }

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

@@ -248,15 +248,21 @@
     <!--举一反三试题列表(随机返回3条)-->
     <select id="listJYFSQuestion" resultType="java.util.Map">
         select q.questionid,q.qtypeid,q.qtypename,q.complexity,q.count,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype
-        ,(select count(*) from t_question_collect qc where qc.questionid=q.questionid)collected
-        ,group_concat(p.pointname)pointname
         from t_question_point qp left join t_question q on qp.questionid=q.questionid
-        left join t_question_point tqp on q.questionid=tqp.questionid
-        left join t_point p on tqp.pointid=p.pointid
         where qp.pointid in(${pointIds}) and qp.questionid!=#{questionid} and q.qstate=1
         and (q.belong in(1,2) or (q.schoolid=#{schoolid} and q.belong=3) or (q.createid=#{userid} and q.belong=4))
         group by qp.questionid order by rand() limit 3
     </select>
+    <!--获取试题是否被某人收藏-->
+    <select id="getCollected" resultType="java.lang.Integer">
+        select count(*) from t_question_collect qc where qc.questionid=#{questionid} and qc.userid=#{userid}
+    </select>
+    <!--获取试题关联知识点-->
+    <select id="getPointName" resultType="java.lang.String">
+        select group_concat(p.pointname)
+        from t_question_point qp left join t_point p on qp.pointid=p.pointid
+        where qp.questionid=#{questionid}
+    </select>
 
     <!-- 根据作业id获取作业附件 -->
     <select id="listObjsByPaperid" resultType="java.util.Map">