|
|
@ -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;
|
|
|
|