问卷调查导出新增分部和提交时间

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

@@ -96,9 +96,14 @@ public class QuestionnaireUserResultServiceImpl extends BaseServiceImpl<Long, Qu
 			List<QuestionnaireQuestionItem> questionItemList = questionnaireQuestionItemDao.findAll(paramMap);
 			Map<Long, List<QuestionnaireQuestionItem>> questionItemMap = questionItemList.stream().collect(Collectors.groupingBy(QuestionnaireQuestionItem::getId));
 			//按学员分组
-			Map<Integer, List<QuestionnaireUserResult>> userIdMap = userResults.stream().collect(Collectors.groupingBy(QuestionnaireUserResult::getUserId));
-			List<Integer> userIdList = new ArrayList<>(userIdMap.keySet());
-			Collections.sort(userIdList);
+			Set<Integer> userIdSet = new LinkedHashSet<>();
+			for (QuestionnaireUserResult userResult : userResults) {
+				userIdSet.add(userResult.getUserId());
+			}
+			List<Integer> userIdList = new ArrayList<>(userIdSet);
+			Map<Integer, List<QuestionnaireUserResult>> userIdMap = userResults.parallelStream().collect(Collectors.groupingBy(QuestionnaireUserResult::getUserId));
+//			List<Integer> userIdList = new ArrayList<>(userIdMap.keySet());
+//			Collections.sort(userIdList);
 			Map<Integer, String> nameList;
 			if(cooperationId != null){
 				nameList = MapUtil.convertMybatisMap(questionnaireQuestionItemDao.queryUserName(cooperationId));