|
@@ -152,9 +152,9 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
|
|
|
List<TEExamWaitDto> list = teExamMapper.getWaitingExam(studentId, examId, orgId);
|
|
|
if (Objects.nonNull(list) && list.size() > 0) {
|
|
|
Set<String> examActivityIdsTemp = new LinkedHashSet<>();
|
|
|
- Map<Long, TEExamWaitDto> setList = new LinkedHashMap<>();
|
|
|
+ Map<Long, TEExamWaitDto> setMap = new LinkedHashMap<>();
|
|
|
for (TEExamWaitDto t : list) {
|
|
|
- setList.put(t.getId(), t);
|
|
|
+ setMap.put(t.getId(), t);
|
|
|
if (t.getExamActivityId().indexOf(",") != -1) {
|
|
|
examActivityIdsTemp.addAll(Arrays.asList(t.getExamActivityId().split(",")));
|
|
|
} else {
|
|
@@ -185,8 +185,10 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
|
|
|
examCache.getExamCount().intValue() - (examStudentCacheBean.getAlreadyExamCount()
|
|
|
.intValue())));
|
|
|
});
|
|
|
- setList.forEach((k, v) -> {
|
|
|
+ list.clear();
|
|
|
+ setMap.forEach((k, v) -> {
|
|
|
v.setActivities(new ArrayList<>(map.get(k)));
|
|
|
+ list.add(v);
|
|
|
});
|
|
|
}
|
|
|
return list;
|