Browse Source

1、课表organ_id_字段初始化;
2、课表列表去除团体名和班级名,搜索更改为按团体编号/课程编号/课程名搜索
3、修复对外课程无部门编号
4、节假日获取方式调整
5、线上乐团课创建
6、服务指标添加教务老师编号

Joe 5 years ago
parent
commit
52b77752e1

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentExtracurricularExercisesSituationServiceImpl.java

@@ -87,6 +87,9 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 							}
 						}
 					}
+					if(StringUtils.isNoneBlank(exercisesSituationDto.getEducationalTeacherName())){
+						continue;
+					}
 					List<StudentEduTeacherDto> t2 = studentEduTeachers.stream().filter(set -> set.getGroupType().equals(GroupType.MUSIC.getCode())).collect(Collectors.toList());
 					if(CollectionUtils.isEmpty(t2)){
 						for (StudentEduTeacherDto studentEduTeacherDto : t2) {