From 0e38d74d082afaa39995c733c18331058ad8530e Mon Sep 17 00:00:00 2001 From: "zhouj1203@hotmail.com" Date: Wed, 28 Aug 2024 15:16:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/service/impl/CommonServiceImpl.java | 2 +- .../java/cn/teammodel/model/dto/admin/exam/OverViewDto.java | 2 -- src/main/java/cn/teammodel/repository/ClassRepository.java | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/CommonServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/CommonServiceImpl.java index 6c9d0f6..9b170ec 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/CommonServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/CommonServiceImpl.java @@ -32,7 +32,7 @@ public class CommonServiceImpl implements CommonService { try { //获取当前学校该学段下详细信息 List period = schoolRepository.findPeriodById(gcDto.getSchoolId(), gcDto.getPeriodId()); - List classes = classRepository.findClassBySchoolIdAndPeriodId(gcDto.getSchoolId(), gcDto.getPeriodId()); + List classes = classRepository.findClassBySchoolIdAndPeriodId(gcDto.getPeriodId()); int year = now().getYear(); Month month = now().getMonth(); int mon = MonthToNumberConverter.convertMonthToNumber(month.name()); diff --git a/src/main/java/cn/teammodel/model/dto/admin/exam/OverViewDto.java b/src/main/java/cn/teammodel/model/dto/admin/exam/OverViewDto.java index 60dcc02..50ed858 100644 --- a/src/main/java/cn/teammodel/model/dto/admin/exam/OverViewDto.java +++ b/src/main/java/cn/teammodel/model/dto/admin/exam/OverViewDto.java @@ -16,6 +16,4 @@ public class OverViewDto { @ApiModelProperty("学生入学年") private int studentYear; private List classIds; - private Long startTime; - private Long endTime; } diff --git a/src/main/java/cn/teammodel/repository/ClassRepository.java b/src/main/java/cn/teammodel/repository/ClassRepository.java index b69920b..bb03d4d 100644 --- a/src/main/java/cn/teammodel/repository/ClassRepository.java +++ b/src/main/java/cn/teammodel/repository/ClassRepository.java @@ -18,6 +18,6 @@ public interface ClassRepository extends CosmosRepository { @Query("select c.id, c.name from School as c where c.code = @code and c.id in (@ids)") List findAllByCodeAndIdIn(String code, Collection ids); - @Query("select c.id, c.name,c.year,c.periodId from School as c where c.school = @school and c.periodId = @periodId and c.pk = 'Class'") - List findClassBySchoolIdAndPeriodId(String school, String periodId); + @Query("select c.id, c.name,c.year,c.periodId from School as c where c.periodId = @periodId and c.pk = 'Class'") + List findClassBySchoolIdAndPeriodId(String periodId); }