|
|
@@ -116,14 +116,15 @@
|
|
|
|
|
|
<!-- 分页查询 -->
|
|
|
<select id="findResultCount" resultMap="QuestionnaireUserResultDto" parameterType="map">
|
|
|
- SELECT qu1.*,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_,qq.type_
|
|
|
- FROM (SELECT qu.user_id_ id_ FROM questionnaire_user_result qu
|
|
|
+ SELECT qu1.*,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_,qq.type_,qur.username_,qur.phone_
|
|
|
+ FROM (SELECT qu.user_id_,su.username_,su.phone_ FROM questionnaire_user_result qu
|
|
|
+ LEFT JOIN sys_user su ON su.id_ = qu.user_id_
|
|
|
WHERE qu.questionnaire_topic_id_ = #{topicId}
|
|
|
<if test="search != null and search != ''">
|
|
|
AND (qu.user_id_ = #{search} OR qu.additional_value_ LIKE CONCAT('%',#{search},'%'))
|
|
|
</if>
|
|
|
GROUP BY qu.user_id_ <include refid="global.limit"/>) qur
|
|
|
- LEFT JOIN questionnaire_user_result qu1 ON qur.id_ = qu1.user_id_
|
|
|
+ LEFT JOIN questionnaire_user_result qu1 ON qur.user_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_)
|
|
|
WHERE qu1.questionnaire_topic_id_ = #{topicId}
|
|
|
@@ -220,7 +221,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="queryUserResult" resultMap="QuestionnaireUserResultDto">
|
|
|
- SELECT qu1.*, qur.username_, qur.phone_, qq.content_,GROUP_CONCAT( qqi.answer_value_ ORDER BY qqi.sort_ ) answer_value_
|
|
|
+ SELECT qu1.*, qur.username_, qur.phone_, qq.content_,GROUP_CONCAT( qqi.answer_value_ ORDER BY qqi.sort_ ) answer_value_,qq.type_
|
|
|
FROM (SELECT qu.user_id_,su.username_,su.phone_
|
|
|
FROM questionnaire_user_result qu
|
|
|
LEFT JOIN sys_user su ON su.id_ = qu.user_id_
|
zouxuan