From b160e7fca476bea3f29394119b7dfa01352130b1 Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Thu, 20 Feb 2025 10:21:56 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AF=BE=E4=BE=8B=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=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 | 8 +++++++- .../cn/teammodel/model/dto/weekDuty/LessonRecordDto.java | 3 ++- 2 files changed, 9 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 6ad0942..9d27b9b 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 @@ -225,11 +225,17 @@ public class AdminIndexDutyServiceImpl implements AdminIndexDutyService { Map mapper; String url = env.getProperty("ies.server-url"); + // 修复：使用 setOk 方法来设置 ok 属性 + //lessonRecordDto.setOk(true); if(lessonRecordDto.isClassMeeting()) { List subjects = schoolRepository.findSubjectById(lessonRecordDto.getSchool(), lessonRecordDto.getPeriodId()); - List subjectIds = subjects.stream().filter(subject -> "班会".equals(subject.getName())) + List subjectIds = subjects.stream().filter(subject -> "班会课".equals(subject.getName())) .map(School.Subject::getId).collect(Collectors.toList()); lessonRecordDto.setSubjectId(subjectIds); + + if(subjectIds.isEmpty()) { + return null; + } } mapper = GroupUtil.getGroupId(lessonRecordDto,new GroupUtil(env), request,url); return mapper; diff --git a/src/main/java/cn/teammodel/model/dto/weekDuty/LessonRecordDto.java b/src/main/java/cn/teammodel/model/dto/weekDuty/LessonRecordDto.java index d96b501..bc72aba 100644 --- a/src/main/java/cn/teammodel/model/dto/weekDuty/LessonRecordDto.java +++ b/src/main/java/cn/teammodel/model/dto/weekDuty/LessonRecordDto.java @@ -1,5 +1,6 @@ package cn.teammodel.model.dto.weekDuty; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.springframework.beans.factory.annotation.Value; @@ -26,7 +27,7 @@ public class LessonRecordDto { private boolean doubleGreen ; @Value("${lessonRecordDto.singleGreen:false}") private boolean singleGreen ; - @Value("${lessonRecordDto.isOk:true}") + @JsonProperty("isOk") private boolean isOk ; @Value("${lessonRecordDto.quality:false}") private boolean quality;