|
@@ -136,6 +136,20 @@
|
|
|
</if>
|
|
|
</where>
|
|
|
</sql>
|
|
|
+
|
|
|
+ <sql id="queryDetailPageSql1">
|
|
|
+ <where>
|
|
|
+ <if test="activeId != null">
|
|
|
+ AND qu1.active_id_ = #{activeId}
|
|
|
+ </if>
|
|
|
+ <if test="activeType != null and activeType != ''">
|
|
|
+ AND qu1.active_type_ = #{activeType}
|
|
|
+ </if>
|
|
|
+ <if test="topicId != null">
|
|
|
+ AND qu1.questionnaire_topic_id_ = #{topicId}
|
|
|
+ </if>
|
|
|
+ </where>
|
|
|
+ </sql>
|
|
|
<select id="queryDetailPage" resultMap="QuestionnaireUserResultDto">
|
|
|
SELECT qu1.*,qur.username_,qur.phone_,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_
|
|
|
FROM (SELECT su.id_,su.username_,su.phone_ FROM questionnaire_user_result qu
|
|
@@ -146,6 +160,7 @@
|
|
|
LEFT JOIN questionnaire_user_result qu1 ON qur.id_ = qu1.user_id_
|
|
|
LEFT JOIN questionnaire_question qq ON qq.id_ = qu1.questionnaire_question_id_
|
|
|
LEFT JOIN questionnaire_question_item qqi ON FIND_IN_SET(qqi.id_,qu1.questionnaire_question_item_id_list_)
|
|
|
+ <include refid="queryDetailPageSql1"/>
|
|
|
GROUP BY qu1.user_id_,qq.id_
|
|
|
ORDER BY qu1.user_id_
|
|
|
</select>
|