调查问卷

mec-biz/src/main/java/com/ym/mec/biz/service/impl/QuestionnaireUserResultServiceImpl.java

@@ -88,7 +88,7 @@ public class QuestionnaireUserResultServiceImpl extends BaseServiceImpl<Long, Qu
 			List<Integer> userIdList = new ArrayList<>(userIdMap.keySet());
 			Collections.sort(userIdList);
 
-			Map<Integer, String> nameList = MapUtil.convertMybatisMap(teacherDao.queryUserNameByIdList(new ArrayList<>(userIdList)));
+			Map<Integer, String> nameList = MapUtil.convertMybatisMap(teacherDao.queryUserNameByIdList(userIdList));
 			Map<Integer, String> phoneList = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(userIdList,",")));
 			for (Integer userId : userIdList) {
 				List<QuestionnaireUserResult> userResultList = userIdMap.get(userId);

mec-biz/src/main/resources/config/mybatis/QuestionnaireUserResultMapper.xml

@@ -158,8 +158,10 @@
 	</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
+		FROM (SELECT su.id_,CASE WHEN su.username_ IS NULL THEN ria.user_name_ ELSE su.username_ END username_,su.phone_ FROM questionnaire_user_result qu
 		LEFT JOIN sys_user su ON su.id_ = qu.user_id_
+		LEFT JOIN replacement_instrument_activity ria ON ria.replacement_instrument_cooperation_id_ = qu.active_id_
+		AND ria.user_id_ = qu.user_id_
 		<include refid="queryDetailPageSql"/>
 		GROUP BY su.id_
 		<include refid="global.limit"/>) qur