소스 검색

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

Joe 5 년 전
부모
커밋
bbeeb676d9
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentExtracurricularExercisesSituationServiceImpl.java

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

@@ -81,8 +81,8 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 					if(!CollectionUtils.isEmpty(t1)){
 						for (StudentEduTeacherDto studentEduTeacherDto : t1) {
 							if(StringUtils.isNotBlank(studentEduTeacherDto.getEducationalTeacherName())){
-								exercisesSituationDto.setEducationalTeacherId(studentEduTeachers.get(0).getEducationalTeacherId());
-								exercisesSituationDto.setEducationalTeacherName(studentEduTeachers.get(0).getEducationalTeacherName());
+								exercisesSituationDto.setEducationalTeacherId(studentEduTeacherDto.getEducationalTeacherId());
+								exercisesSituationDto.setEducationalTeacherName(studentEduTeacherDto.getEducationalTeacherName());
 								break;
 							}
 						}
@@ -94,8 +94,8 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 					if(!CollectionUtils.isEmpty(t2)){
 						for (StudentEduTeacherDto studentEduTeacherDto : t2) {
 							if(StringUtils.isNotBlank(studentEduTeacherDto.getEducationalTeacherName())){
-								exercisesSituationDto.setEducationalTeacherId(studentEduTeachers.get(0).getEducationalTeacherId());
-								exercisesSituationDto.setEducationalTeacherName(studentEduTeachers.get(0).getEducationalTeacherName());
+								exercisesSituationDto.setEducationalTeacherId(studentEduTeacherDto.getEducationalTeacherId());
+								exercisesSituationDto.setEducationalTeacherName(studentEduTeacherDto.getEducationalTeacherName());
 								break;
 							}
 						}