From 22cc5dc871f8aa6b99beb67b62e94a5abf66208f Mon Sep 17 00:00:00 2001 From: cat_shark <1716967236@qq.com> Date: Sun, 5 Jul 2026 12:35:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=8E=86=E5=8F=B2=E6=8A=A5=E5=91=8A):=20?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=A6=E4=B9=A0=E9=A2=84=E6=9C=9F=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E4=BB=A5=E5=8C=BA=E5=88=86=E5=90=84=E4=BC=9A=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit StudyReportsEntity 新增 sessionExpectation 字段（非数据库）， getTaskReports() 查询后自动填充对应会话的预期描述， 前端报告条目显示 sessionNum + 预期目标。 --- .../entity/StudyReportsEntity.java | 5 +++++ .../service/impl/StudySessionsServiceImpl.java | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/guo/learningprogresstracker/entity/StudyReportsEntity.java b/src/main/java/com/guo/learningprogresstracker/entity/StudyReportsEntity.java index 77add7a..d2b82bf 100644 --- a/src/main/java/com/guo/learningprogresstracker/entity/StudyReportsEntity.java +++ b/src/main/java/com/guo/learningprogresstracker/entity/StudyReportsEntity.java @@ -33,6 +33,11 @@ public class StudyReportsEntity extends BaseEntity implements Serializable { @TableField(value = "content") private String content; + /** + * 对应学习会话的预期目标（非数据库字段，查询时填充） + */ + @TableField(exist = false) + private String sessionExpectation; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/StudySessionsServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/StudySessionsServiceImpl.java index 7628d07..fcc93d6 100644 --- a/src/main/java/com/guo/learningprogresstracker/service/impl/StudySessionsServiceImpl.java +++ b/src/main/java/com/guo/learningprogresstracker/service/impl/StudySessionsServiceImpl.java @@ -214,7 +214,15 @@ public class StudySessionsServiceImpl extends ServiceImpl result = studyReportsMapper.selectPage(pg, wrapper); + // 填充每个报告对应会话的预期目标 + for (StudyReportsEntity report : result.getRecords()) { + if (report.getSessionNum() != null) { + Optional.ofNullable(studyExpectationsService.getBySessionNum(report.getSessionNum())) + .ifPresent(e -> report.setSessionExpectation(e.getDescription())); + } + } + return result; } // ============ 活跃会话查询 ============