|
@@ -100,13 +100,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
q.type,
|
|
|
count( q.question_id ) AS num
|
|
|
FROM
|
|
|
- ( SELECT * FROM collect_question WHERE user_id = #{userId} ) cq
|
|
|
+ ( SELECT c.* FROM collect_question c
|
|
|
+ LEFT JOIN exam e ON c.exam_id = e.exam_id
|
|
|
+ LEFT JOIN exam_paper ep ON ep.paper_id = e.exam_paper_id
|
|
|
+ WHERE user_id = #{userId}
|
|
|
+ <if test="paperId != null and paperId != ''">
|
|
|
+ AND e.exam_paper_id = #{paperId}
|
|
|
+ </if>
|
|
|
+ ) cq
|
|
|
LEFT JOIN question q ON cq.question_id = q.question_id
|
|
|
+
|
|
|
WHERE
|
|
|
1 = 1
|
|
|
<if test="goodsId != null and goodsId != ''">
|
|
|
AND cq.goods_id = #{goodsId}
|
|
|
</if>
|
|
|
+
|
|
|
GROUP BY
|
|
|
q.type
|
|
|
</select>
|