|  | @@ -107,7 +107,7 @@
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      <!-- 分页查询 -->
 |  |      <!-- 分页查询 -->
 | 
											
												
													
														|  |  	<select id="findResultCount" resultMap="QuestionnaireUserResultDto" parameterType="map">
 |  |  	<select id="findResultCount" resultMap="QuestionnaireUserResultDto" parameterType="map">
 | 
											
												
													
														|  | -		SELECT qu1.*,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_
 |  | 
 | 
											
												
													
														|  | 
 |  | +		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
 |  |  		FROM (SELECT qu.user_id_ id_ FROM questionnaire_user_result qu
 | 
											
												
													
														|  |  		WHERE qu.questionnaire_topic_id_ = #{topicId}
 |  |  		WHERE qu.questionnaire_topic_id_ = #{topicId}
 | 
											
												
													
														|  |  		<if test="search != null and search != ''">
 |  |  		<if test="search != null and search != ''">
 | 
											
										
											
												
													
														|  | @@ -159,6 +159,7 @@
 | 
											
												
													
														|  |  			<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
 |  |  			<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
 | 
											
												
													
														|  |  			<result column="questionnaire_question_item_id_list_" property="questionnaireQuestionItemIdList" />
 |  |  			<result column="questionnaire_question_item_id_list_" property="questionnaireQuestionItemIdList" />
 | 
											
												
													
														|  |  			<result column="additional_value_" property="additionalValue" />
 |  |  			<result column="additional_value_" property="additionalValue" />
 | 
											
												
													
														|  | 
 |  | +			<result column="type_" property="type" />
 | 
											
												
													
														|  |  		</collection>
 |  |  		</collection>
 | 
											
												
													
														|  |  	</resultMap>
 |  |  	</resultMap>
 | 
											
												
													
														|  |  	<sql id="queryDetailPageSql">
 |  |  	<sql id="queryDetailPageSql">
 |