update 课例相关查询内容

develop
hhb@hotmail.com 2 months ago
parent 07165e5e61
commit b160e7fca4

@ -225,11 +225,17 @@ public class AdminIndexDutyServiceImpl implements AdminIndexDutyService {
Map<String, Object> mapper; Map<String, Object> mapper;
String url = env.getProperty("ies.server-url"); String url = env.getProperty("ies.server-url");
// 修复:使用 setOk 方法来设置 ok 属性
//lessonRecordDto.setOk(true);
if(lessonRecordDto.isClassMeeting()) { if(lessonRecordDto.isClassMeeting()) {
List<School.Subject> subjects = schoolRepository.findSubjectById(lessonRecordDto.getSchool(), lessonRecordDto.getPeriodId()); List<School.Subject> subjects = schoolRepository.findSubjectById(lessonRecordDto.getSchool(), lessonRecordDto.getPeriodId());
List<String> subjectIds = subjects.stream().filter(subject -> "班会".equals(subject.getName())) List<String> subjectIds = subjects.stream().filter(subject -> "班会".equals(subject.getName()))
.map(School.Subject::getId).collect(Collectors.toList()); .map(School.Subject::getId).collect(Collectors.toList());
lessonRecordDto.setSubjectId(subjectIds); lessonRecordDto.setSubjectId(subjectIds);
if(subjectIds.isEmpty()) {
return null;
}
} }
mapper = GroupUtil.getGroupId(lessonRecordDto,new GroupUtil(env), request,url); mapper = GroupUtil.getGroupId(lessonRecordDto,new GroupUtil(env), request,url);
return mapper; return mapper;

@ -1,5 +1,6 @@
package cn.teammodel.model.dto.weekDuty; package cn.teammodel.model.dto.weekDuty;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -26,7 +27,7 @@ public class LessonRecordDto {
private boolean doubleGreen ; private boolean doubleGreen ;
@Value("${lessonRecordDto.singleGreen:false}") @Value("${lessonRecordDto.singleGreen:false}")
private boolean singleGreen ; private boolean singleGreen ;
@Value("${lessonRecordDto.isOk:true}") @JsonProperty("isOk")
private boolean isOk ; private boolean isOk ;
@Value("${lessonRecordDto.quality:false}") @Value("${lessonRecordDto.quality:false}")
private boolean quality; private boolean quality;

Loading…
Cancel
Save