diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImpl.java index 3399602..db9f8a8 100644 --- a/src/main/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImpl.java +++ b/src/main/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImpl.java @@ -32,6 +32,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -119,7 +120,6 @@ public class ReviewServiceImpl implements ReviewService { : null; if (session != null) { detail.setSessionTaskNum(session.getTaskNum()); - detail.setSessionTaskName(loadTaskName(session.getTaskNum())); } Optional.ofNullable(studyExpectationsService.getBySessionNum(report.getSessionNum())) .ifPresent(e -> detail.setSessionExpectation(e.getDescription())); @@ -131,12 +131,18 @@ public class ReviewServiceImpl implements ReviewService { .eq(StudyReportFragmentsEntity::getContextNum, report.getSessionNum()) .orderByAsc(StudyReportFragmentsEntity::getCreatedTime)); - // 归属任务名一次 IN 取齐:computeIfAbsent 里逐个查会把分组数变成额外的 N 次往返 - Set ownerTaskNums = fragments.stream() + // 会话任务名与归属任务名一次 IN 取齐:逐个查会把分组数变成额外的 N 次往返 + Set taskNums = fragments.stream() .map(StudyReportFragmentsEntity::getOwnerTaskNum) .filter(StringUtils::hasText) - .collect(Collectors.toSet()); - Map ownerTaskNames = loadTaskNames(ownerTaskNums); + .collect(Collectors.toCollection(LinkedHashSet::new)); + if (session != null && StringUtils.hasText(session.getTaskNum())) { + taskNums.add(session.getTaskNum()); + } + Map taskNames = loadTaskNames(taskNums); + if (session != null) { + detail.setSessionTaskName(taskNames.get(session.getTaskNum())); + } Map groups = new LinkedHashMap<>(); for (StudyReportFragmentsEntity fragment : fragments) { String owner = fragment.getOwnerTaskNum(); @@ -144,7 +150,7 @@ public class ReviewServiceImpl implements ReviewService { StudyReportDetail.FragmentGroup group = groups.computeIfAbsent(key, k -> { StudyReportDetail.FragmentGroup created = new StudyReportDetail.FragmentGroup(); created.setTaskNum(StringUtils.hasText(owner) ? owner : null); - created.setTaskName(StringUtils.hasText(owner) ? ownerTaskNames.get(owner) : null); + created.setTaskName(StringUtils.hasText(owner) ? taskNames.get(owner) : null); // 旁支 = 归属不是本会话所属任务的内容 created.setBranch(!StringUtils.hasText(owner) || !Objects.equals(owner, detail.getSessionTaskNum())); return created; @@ -268,10 +274,6 @@ public class ReviewServiceImpl implements ReviewService { return new ReviewSortPreference(preset.name(), preset.getDescription()); } - private String loadTaskName(String taskNum) { - return StringUtils.hasText(taskNum) ? loadTaskNames(List.of(taskNum)).get(taskNum) : null; - } - /** 任务名一次 IN 取齐;已删除的任务不在结果里,调用方按 null 处理 */ private Map loadTaskNames(Collection taskNums) { if (taskNums.isEmpty()) {