|
@@ -15,6 +15,7 @@ import javax.annotation.Resource;
|
|
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.yonge.cooleshow.biz.dal.queryInfo.TeacherQueryInfo;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.SubjectService;
|
|
|
import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
|
|
|
import com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherWrapper;
|
|
|
import org.redisson.api.RMap;
|
|
@@ -111,6 +112,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
|
private UserFirstTimeService userFirstTimeService;
|
|
|
@Autowired
|
|
|
private TeacherTotalService totalService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private SubjectService subjectService;
|
|
|
|
|
|
@Autowired
|
|
|
private StudentStarDao studentStarDao;
|
|
@@ -189,6 +193,13 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
|
teacherHomeVo.setEntryStatus(entryRecord.getTeacherAuthStatus());
|
|
|
}
|
|
|
}
|
|
|
+ // 设置默认查询声部名称
|
|
|
+ if (teacher.getDefaultSubject() != null) {
|
|
|
+ Subject subject = subjectService.get(teacher.getDefaultSubject());
|
|
|
+ if (subject != null) {
|
|
|
+ teacherHomeVo.setDefaultSubjectName(subject.getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if (YesOrNoEnum.YES.equals(teacher.getMusicianFlag())) {
|
|
|
teacherHomeVo.setMusicianAuthStatus(AuthStatusEnum.PASS);
|