update 调整性别 学历等数据

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

@@ -206,12 +206,28 @@ public class TeacherServiceImpl implements TeacherService {
                     teacher.setDegree(gpTeacher.getDegree() != null ? gpTeacher.getDegree() : "");
                 }
             });*/
-            Map<String, Long> genderCount = teachersList.stream()
+
+            List<GpTeacherVo> copyList = new ArrayList<>(teachersList);
+            // 同步保存，确保数据持久化
+            asyncTeacherService.asyncSavePtTeacherInfos(Collections.unmodifiableList(copyList));
+            //asyncTeacherService.syncSavePtTeacherInfos(teachersList);  // 假设改为同步方法
+
+            // 优化查询与匹配
+           /* Set<String> teacherIds = teachersList.stream()
+                    .map(GpTeacherVo::getId)
+                    .collect(Collectors.toSet());*/
+
+            String code = String.format(PK.PTTEACHER, teacherDto.getCode());
+            List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code);
+
+            Map<String, Long> genderCount = ptTeacherInfos.stream()
                     .filter(gpTeacher -> gpTeacher.getGender() != null)
-                    .collect(Collectors.groupingBy(GpTeacherVo::getGender, Collectors.counting()));
+                    .collect(Collectors.groupingBy(PtTeacherInfo::getGender, Collectors.counting()));
-            Map<String, Long> degreeCount = teachersList.stream()
+            //移除key为U的键值对
-                    .filter(gpTeacher -> gpTeacher.getDegree() != null)
+            genderCount.remove("U");
-                    .collect(Collectors.groupingBy(GpTeacherVo::getDegree, Collectors.counting()));
+            Map<String, Long> degreeCount = ptTeacherInfos.stream()
+                    .filter(gpTeacher -> StringUtils.isNotEmpty(gpTeacher.getDegree()))
+                    .collect(Collectors.groupingBy(PtTeacherInfo::getDegree, Collectors.counting()));
             //Map<String, Integer> practiceCount = getStringIntegerMap(teacherDto, gpTeachers);
 
             /*if(!genderCount.containsKey("F")) {
@@ -224,18 +240,7 @@ public class TeacherServiceImpl implements TeacherService {
 
             teachers.put("gender", genderCount);
             teachers.put("degree", degreeCount);
-            List<GpTeacherVo> copyList = new ArrayList<>(teachersList);
-            // 同步保存，确保数据持久化
-            asyncTeacherService.asyncSavePtTeacherInfos(Collections.unmodifiableList(copyList));
-            //asyncTeacherService.syncSavePtTeacherInfos(teachersList);  // 假设改为同步方法
 
-            // 优化查询与匹配
-           /* Set<String> teacherIds = teachersList.stream()
-                    .map(GpTeacherVo::getId)
-                    .collect(Collectors.toSet());*/
-
-            String code = String.format(PK.PTTEACHER, teacherDto.getCode());
-            List<PtTeacherInfo> ptTeacherInfos = ptTeacherRepository.findAllTeacher(teacherDto.getCode(),code);
 //            Map<String, PtTeacherInfo> idToPtTeacherInfo = ptTeacherInfos.stream()
 //                    .collect(Collectors.toMap(PtTeacherInfo::getId, Function.identity()));
 //