From 40d2f399eb406ee4aa5d2653314e7fcc2ffcba32 Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Fri, 28 Feb 2025 11:22:07 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=95=99=E5=AD=A6=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/AdminIndexDutyServiceImpl.java | 5 ++++- .../cn/teammodel/model/dto/admin/teacher/TeacherDto.java | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/AdminIndexDutyServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/AdminIndexDutyServiceImpl.java index 244abc4..0044573 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/AdminIndexDutyServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/AdminIndexDutyServiceImpl.java @@ -264,7 +264,10 @@ public class AdminIndexDutyServiceImpl implements AdminIndexDutyService { lessonRecordKey, startTime, endTime, subjectId, tmdId, grade, periodId ); - for(String classId : teacherDto.getClassIds()) { + Set classIds = records.stream().filter(lessonRecord -> lessonRecord.getTmdid().equalsIgnoreCase(teacherDto.getTmdId())) + .flatMap(record -> record.getGroupIds().stream()) + .collect(Collectors.toSet()); + for(String classId : classIds) { Map mapper = new HashMap<>(); // 计算本学期互动总数 int totalClientInteractionCount = records.stream().filter(lessonRecord -> diff --git a/src/main/java/cn/teammodel/model/dto/admin/teacher/TeacherDto.java b/src/main/java/cn/teammodel/model/dto/admin/teacher/TeacherDto.java index 5efc685..88cf4dc 100644 --- a/src/main/java/cn/teammodel/model/dto/admin/teacher/TeacherDto.java +++ b/src/main/java/cn/teammodel/model/dto/admin/teacher/TeacherDto.java @@ -27,5 +27,4 @@ public class TeacherDto { public String semesterId; public List duration = new ArrayList<>(); public List school_shortcode = new ArrayList<>(); - private List classIds; }