|
|
|
@ -2587,13 +2587,12 @@ public class TeacherServiceImpl implements TeacherService {
|
|
|
|
|
|
|
|
|
|
Map<String, Integer> periodCountMap = new HashMap<>();
|
|
|
|
|
for (School.Period period : periods) {
|
|
|
|
|
for ( School.Subject subject : period.getSubjects()) {
|
|
|
|
|
for (PtTeacherInfo schoolTeacher : ptTeacherInfos) {
|
|
|
|
|
if (schoolTeacher.getSubjectIds().contains(subject.getId())) {
|
|
|
|
|
if (schoolTeacher.getPeriodId().equalsIgnoreCase(period.getId())) {
|
|
|
|
|
periodCountMap.put(period.getId(), periodCountMap.getOrDefault(period.getId(), 0) + 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
Map<String, String> periodNameMap = new HashMap<>();
|
|
|
|
|
List<String> periodNames = new ArrayList<>();
|
|
|
|
|