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;