From 0928fd045a16a8804c3d77d28e4d6d12f031c620 Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Fri, 3 Jan 2025 18:23:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AF=BE=E5=88=97=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/service/impl/TeacherServiceImpl.java | 4 ++-- .../java/cn/teammodel/repository/LessonRecordRepository.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java index 701a7e2..0002d7a 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java @@ -437,7 +437,7 @@ public class TeacherServiceImpl implements TeacherService { long startTimestamp = startDatetime.toInstant(ZoneOffset.UTC).toEpochMilli(); long endTimestamp = endDatetime.toInstant(ZoneOffset.UTC).toEpochMilli(); - List lessonRecords = lessonRecordRepository.getLessonsByConditions(String.format(PK.PK_LESSON_RECORD, teacherDto.getCode()), startTimestamp, endTimestamp, teacherDto.getSubjectId(),teacherDto.getTmdId(),teacherDto.getPeriodId()); + List lessonRecords = lessonRecordRepository.getLessonsByConditions(String.format(PK.PK_LESSON_RECORD, teacherDto.getCode()), startTimestamp, endTimestamp, teacherDto.getSubjectId(),teacherDto.getTmdId(),teacherDto.getGrade(),teacherDto.getPeriodId()); int[] counts = {0, 0, 0, 0, 0}; String[] keys = {"cooperation", "internet", "task", "exam", "diffential"}; @@ -746,7 +746,7 @@ public class TeacherServiceImpl implements TeacherService { } } } - List lessonRecords = lessonRecordRepository.getLessonsByConditions(String.format(PK.PK_LESSON_RECORD, teacherDto.getCode()), teacherDto.getStartTime(), teacherDto.getEndTime(), teacherDto.getSubjectId(),teacherDto.getTmdId(),teacherDto.getPeriodId()); + List lessonRecords = lessonRecordRepository.getLessonsByConditions(String.format(PK.PK_LESSON_RECORD, teacherDto.getCode()), teacherDto.getStartTime(), teacherDto.getEndTime(), teacherDto.getSubjectId(),teacherDto.getTmdId(),teacherDto.getGrade(),teacherDto.getPeriodId()); if(teacherDto.getTmdId() != null) { List sugVos = sugVoList.stream().filter(sugVo -> sugVo.getHabook().equals(teacherDto.getTmdId())).collect(Collectors.toList()); diff --git a/src/main/java/cn/teammodel/repository/LessonRecordRepository.java b/src/main/java/cn/teammodel/repository/LessonRecordRepository.java index 17f4e71..eda86af 100644 --- a/src/main/java/cn/teammodel/repository/LessonRecordRepository.java +++ b/src/main/java/cn/teammodel/repository/LessonRecordRepository.java @@ -16,11 +16,12 @@ public interface LessonRecordRepository extends CosmosRepository= @startTime) and " + "(IS_NULL(@endTime) or c.startTime <= @endTime) and "+ + "(IS_NULL(@grade) or array_contains(c.grade,@grade) and " + "c.status<>404 and "+ "c.periodId = @periodId and "+ "(IS_NULL(@subjectId) or c.subjectId = @subjectId) and"+ "(IS_NULL(@tmdId) or c.tmdId = @tmdId) ") - List getLessonsByConditions(String code, Long startTime, Long endTime,String subjectId,String tmdId,String periodId); + List getLessonsByConditions(String code, Long startTime, Long endTime,String subjectId,String tmdId,String grade,String periodId); @Query("select * from LessonRecord as c where c.code = @code and c.expire<=0 and c.status<>404 and c.tmdid = @tmdId and c.periodId = @periodId and" +