调查问卷

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

@@ -85,7 +85,9 @@ public class QuestionnaireUserResultServiceImpl extends BaseServiceImpl<Long, Qu
 			Map<Long, List<QuestionnaireQuestionItem>> questionItemMap = questionItemList.stream().collect(Collectors.groupingBy(QuestionnaireQuestionItem::getId));
 			//按学员分组
 			Map<Integer, List<QuestionnaireUserResult>> userIdMap = userResults.stream().collect(Collectors.groupingBy(QuestionnaireUserResult::getUserId));
-			Set<Integer> userIdList = userIdMap.keySet();
+			List<Integer> userIdList = new ArrayList<>(userIdMap.keySet());
+			Collections.sort(userIdList);
+
 			Map<Integer, String> nameList = MapUtil.convertMybatisMap(teacherDao.queryUserNameByIdList(new ArrayList<>(userIdList)));
 			Map<Integer, String> phoneList = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(userIdList,",")));
 			for (Integer userId : userIdList) {
@@ -105,7 +107,7 @@ public class QuestionnaireUserResultServiceImpl extends BaseServiceImpl<Long, Qu
 						//获取问题列表
 						QuestionnaireQuestion question = questionMap.get(result.getQuestionnaireQuestionId()).get(0);
 						String questionnaireQuestionItemIdList = result.getQuestionnaireQuestionItemIdList();
-						StringBuffer userResult = new StringBuffer("");
+						StringBuffer userResult = new StringBuffer();
 						if(StringUtils.isNotEmpty(questionnaireQuestionItemIdList)){
 							String[] split = questionnaireQuestionItemIdList.split(",");
 							for (String s : split) {