diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java index 076a040..adb4680 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java @@ -119,7 +119,7 @@ public class TeacherServiceImpl implements TeacherService { //Map groupCountMap = new HashMap<>(); String code = String.format(PK.PTTEACHER, teacherDto.getCode()); //List groupLists = getCachedGroupLists(code); - List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code); + List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code,teacherDto.getPeriodId()); teacherCountMap.put("教师总人数", ptTeacherInfos.size()); List school = schoolRepository.findBaseById(teacherDto.getCode()); List subjects = new ArrayList<>(); @@ -184,7 +184,7 @@ public class TeacherServiceImpl implements TeacherService { .filter(t -> !t.getStatus().equals("delete")) .collect(Collectors.toList()); String code = String.format(PK.PTTEACHER, teacherDto.getCode()); - List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code); + List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code,teacherDto.getPeriodId()); //根据ID筛选出teachersList中不在ptTeacherInfos中的数据 Set ptIds = ptTeacherInfos.stream() .map(PtTeacherInfo::getId) @@ -257,7 +257,7 @@ public class TeacherServiceImpl implements TeacherService { // 同步保存,确保数据持久化 asyncTeacherService.asyncSavePtTeacherInfos(Collections.unmodifiableList(copyList)); String code = String.format(PK.PTTEACHER, teacherDto.getCode()); - List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code); + List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code,teacherDto.getPeriodId()); Map genderCount = ptTeacherInfos.stream() .filter(gpTeacher -> gpTeacher.getGender() != null) @@ -663,7 +663,8 @@ public class TeacherServiceImpl implements TeacherService { try { List teachers = ptTeacherRepository.findAllTeacher( teacherDto.getCode(), - String.format(PK.PTTEACHER, teacherDto.getCode()) + String.format(PK.PTTEACHER, teacherDto.getCode()), + teacherDto.getPeriodId() ); teachers = teachers.stream() .filter(teacher -> teacherDto.periodId.equals(teacher.getPeriodId())) @@ -753,7 +754,7 @@ public class TeacherServiceImpl implements TeacherService { String code = String.format(PK.PTTEACHER, teacherDto.getCode()); try { //获取教师平台教师列表 - List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code); + List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code,teacherDto.getPeriodId()); ptTeacherInfos = ptTeacherInfos.stream() .filter(teacher -> teacherDto.periodId.equals(teacher.getPeriodId())) @@ -1995,7 +1996,7 @@ public class TeacherServiceImpl implements TeacherService { String LessonCode = String.format(PK.PK_LESSON_RECORD, teacherDto.getCode()); List> ptTeachers = new ArrayList<>(); try { - List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(), code); + List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(), code,teacherDto.getPeriodId()); //获取ptTeacherInfos中所有的老师ID List teacherIds = ptTeacherInfos.stream().map(PtTeacherInfo::getId).collect(Collectors.toList()); //整合教研 教学数据 @@ -2300,7 +2301,7 @@ public class TeacherServiceImpl implements TeacherService { public void saveFiveScores(TeacherDto teacherDto, HttpServletRequest request) { String code = String.format(PK.PTTEACHER, teacherDto.getCode()); try { - List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(), code); + List ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(), code, teacherDto.getPeriodId()); if (!ptTeacherInfos.isEmpty()) { List teachers = ptTeacherInfos.stream() .peek(ptTeacherInfo -> { diff --git a/src/main/java/cn/teammodel/repository/PtTeacherRepository.java b/src/main/java/cn/teammodel/repository/PtTeacherRepository.java index 0d0390b..0eff190 100644 --- a/src/main/java/cn/teammodel/repository/PtTeacherRepository.java +++ b/src/main/java/cn/teammodel/repository/PtTeacherRepository.java @@ -16,8 +16,8 @@ public interface PtTeacherRepository extends CosmosRepository findByIdCodePairs(@Param("pairs") List pairs); - @Query(value = "SELECT * FROM c WHERE c.pk = 'PtTeacher' and c.school = @school and c.code = @code and c.state = 1 and c.status != 'delete' ") - List findAllTeacher(String school,String code); + @Query(value = "SELECT * FROM c WHERE c.pk = 'PtTeacher' and c.school = @school and c.code = @code and c.state = 1 and c.status != 'delete' and c.periodId = @periodId ") + List findAllTeacher(String school,String code,String periodId); @Query(value = "SELECT * FROM c WHERE c.pk = 'PtTeacher' and c.code = @code and c.state = 1 and c.status != 'delete' ") List findByCode(String code); @Query(value = "SELECT * FROM c WHERE c.pk = 'PtTeacher' and c.state = 1 and c.status != 'delete' ")