|
|
@ -216,19 +216,19 @@ public class TeacherServiceImpl implements TeacherService {
|
|
|
|
.map(GpTeacherVo::getId)
|
|
|
|
.map(GpTeacherVo::getId)
|
|
|
|
.collect(Collectors.toSet());
|
|
|
|
.collect(Collectors.toSet());
|
|
|
|
|
|
|
|
|
|
|
|
String code = String.format(PK.PTTEACHER, teacherDto.getCode());
|
|
|
|
//String code = String.format(PK.PTTEACHER, teacherDto.getCode());
|
|
|
|
List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherIds, code);
|
|
|
|
List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherIds, teacherDto.getCode());
|
|
|
|
Map<String, PtTeacherInfo> idToPtTeacherInfo = ptTeacherInfos.stream()
|
|
|
|
// Map<String, PtTeacherInfo> idToPtTeacherInfo = ptTeacherInfos.stream()
|
|
|
|
.collect(Collectors.toMap(PtTeacherInfo::getId, Function.identity()));
|
|
|
|
// .collect(Collectors.toMap(PtTeacherInfo::getId, Function.identity()));
|
|
|
|
|
|
|
|
//
|
|
|
|
teachersList.forEach(teacher -> {
|
|
|
|
// teachersList.forEach(teacher -> {
|
|
|
|
PtTeacherInfo info = idToPtTeacherInfo.get(teacher.getId());
|
|
|
|
// PtTeacherInfo info = idToPtTeacherInfo.get(teacher.getId());
|
|
|
|
if (info != null) {
|
|
|
|
// if (info != null) {
|
|
|
|
teacher.setIdentity(info.getIdentity());
|
|
|
|
// teacher.setIdentity(info.getIdentity());
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
});
|
|
|
|
// });
|
|
|
|
teachers.put("info", teachersList);
|
|
|
|
teachers.put("info", ptTeacherInfos);
|
|
|
|
//teachers.remove("teachers");
|
|
|
|
teachers.remove("teachers");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}catch (Exception e) {
|
|
|
|
}catch (Exception e) {
|
|
|
|