update 处理学段条件

src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java

@@ -119,7 +119,7 @@ public class TeacherServiceImpl implements TeacherService {
         //Map<String, Integer> groupCountMap = new HashMap<>();
         String code = String.format(PK.PTTEACHER, teacherDto.getCode());
        //List<GroupList> groupLists = getCachedGroupLists(code);
-        List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code);
+        List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code,teacherDto.getPeriodId());
        teacherCountMap.put("教师总人数", ptTeacherInfos.size());
        List<School> school = schoolRepository.findBaseById(teacherDto.getCode());
        List<School.Subject> 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<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code);
+                List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code,teacherDto.getPeriodId());
                 //根据ID筛选出teachersList中不在ptTeacherInfos中的数据
                 Set<String> 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<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code);
+            List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code,teacherDto.getPeriodId());
 
             Map<String, Long> genderCount = ptTeacherInfos.stream()
                     .filter(gpTeacher -> gpTeacher.getGender() != null)
@@ -663,7 +663,8 @@ public class TeacherServiceImpl implements TeacherService {
         try {
             List<PtTeacherInfo> 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<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code);
+            List<PtTeacherInfo> 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<Map<String, Object>> ptTeachers = new ArrayList<>();
         try {
-            List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(), code);
+            List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(), code,teacherDto.getPeriodId());
             //获取ptTeacherInfos中所有的老师ID
             List<String> 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<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(), code);
+            List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(), code,  teacherDto.getPeriodId());
             if (!ptTeacherInfos.isEmpty()) {
                 List<PtTeacherInfo> teachers = ptTeacherInfos.stream()
                         .peek(ptTeacherInfo -> {

src/main/java/cn/teammodel/repository/PtTeacherRepository.java

@@ -16,8 +16,8 @@ public interface PtTeacherRepository extends CosmosRepository<PtTeacherInfo, Str
 
     @Query(value = "SELECT * FROM c WHERE ARRAY_CONTAINS(@pairs, {id: c.id, code: c.code}, true) and c.pk = 'PtTeacher' and c.state = 1 and c.status != 'delete'" )
     List<PtTeacherInfo> findByIdCodePairs(@Param("pairs") List<IdCodePair> 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' ")
+    @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<PtTeacherInfo> findAllTeacher(String school,String code);
+    List<PtTeacherInfo> 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<PtTeacherInfo> findByCode(String code);
     @Query(value = "SELECT * FROM c WHERE c.pk = 'PtTeacher' and c.state = 1 and c.status != 'delete' ")