From 02fa60e427d4e59bf2bffccb80cca801b060e28f Mon Sep 17 00:00:00 2001
From: "hhb@hotmail.com" <hhb@hotmail.com>
Date: Tue, 24 Dec 2024 16:41:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=AD=A3=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/TeacherController.java   |  5 ++-
 .../admin/service/TeacherService.java         |  3 +-
 .../service/impl/TeacherServiceImpl.java      | 39 +++++++++++--------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/main/java/cn/teammodel/controller/admin/controller/TeacherController.java b/src/main/java/cn/teammodel/controller/admin/controller/TeacherController.java
index 10c5740..0884d0e 100644
--- a/src/main/java/cn/teammodel/controller/admin/controller/TeacherController.java
+++ b/src/main/java/cn/teammodel/controller/admin/controller/TeacherController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -69,8 +70,8 @@ public class TeacherController {
     }
     @PostMapping("getTeachingOfTeacher")
     @ApiOperation("获取教师教学法数据")
-    public R<List<Map<String,Map<String,Object>>>> getTeachingOfTeacher(@Valid @RequestBody TeacherDto teacherDto, HttpServletRequest request) {
-        List<Map<String,Map<String,Object>>> res = teacherService.getTeachingOfTeacher(teacherDto,request);
+    public R<List<LinkedHashMap<String, LinkedHashMap<String,Object>>> > getTeachingOfTeacher(@Valid @RequestBody TeacherDto teacherDto, HttpServletRequest request) {
+        List<LinkedHashMap<String,LinkedHashMap<String,Object>>>  res = teacherService.getTeachingOfTeacher(teacherDto,request);
         return R.success(res);
     }
 
diff --git a/src/main/java/cn/teammodel/controller/admin/service/TeacherService.java b/src/main/java/cn/teammodel/controller/admin/service/TeacherService.java
index a1ebbff..9ca4305 100644
--- a/src/main/java/cn/teammodel/controller/admin/service/TeacherService.java
+++ b/src/main/java/cn/teammodel/controller/admin/service/TeacherService.java
@@ -4,6 +4,7 @@ import cn.teammodel.model.dto.admin.teacher.GpTeacherDto;
 import cn.teammodel.model.dto.admin.teacher.TeacherDto;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -15,5 +16,5 @@ public interface TeacherService {
     Map<String,Object> getTeacherGradeCount(TeacherDto teacherDto, HttpServletRequest request);
     List<Map<String,Map<String, Long>>> getDistributionOfTeachers(TeacherDto teacherDto, HttpServletRequest request);
     Map<String,Object> getTeachingAndResearch(TeacherDto teacherDto, HttpServletRequest request);
-    List<Map<String,Map<String,Object>>> getTeachingOfTeacher(TeacherDto teacherDto, HttpServletRequest request);
+    List<LinkedHashMap<String, LinkedHashMap<String,Object>>>  getTeachingOfTeacher(TeacherDto teacherDto, HttpServletRequest request);
 }
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 c9abf99..e69b4c8 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
@@ -763,11 +763,11 @@ public class TeacherServiceImpl implements TeacherService {
     }
 
     @Override
-    public List<Map<String,Map<String,Object>>> getTeachingOfTeacher(TeacherDto teacherDto, HttpServletRequest request) {
-        List<Map<String,Map<String,Object>>> list = new ArrayList<>();
+    public List<LinkedHashMap<String,LinkedHashMap<String,Object>>> getTeachingOfTeacher(TeacherDto teacherDto, HttpServletRequest request) {
+        List<LinkedHashMap<String,LinkedHashMap<String,Object>>> list = new ArrayList<>();
         if(teacherDto.getGrade() != null) {
-            Map<String,Map<String,Object>> map = new HashMap<>();
-            Map<String,Object> mapTeach = new HashMap<>();
+            LinkedHashMap<String,LinkedHashMap<String,Object>> map = new LinkedHashMap<>();
+            LinkedHashMap<String,Object> mapTeach = new LinkedHashMap<>();
             mapTeach.put("interaction", new Random().nextInt(50) + 1);
             mapTeach.put("cooperation", new Random().nextInt(50) + 1);
             mapTeach.put("test", new Random().nextInt(50) + 1);
@@ -779,19 +779,10 @@ public class TeacherServiceImpl implements TeacherService {
         }else {
 
             List<School> school = schoolRepository.findBaseById(teacherDto.getCode());
-            List<String> grades = new ArrayList<>();
-            if(school != null && !school.isEmpty()) {
-                for (School base : school) {
-                   for (School.Period period : base.getPeriod()) {
-                       if(period.getId().equals(teacherDto.getPeriodId())) {
-                           grades = period.getGrades();
-                       }
-                   }
-                }
-            }
-            Map<String,Map<String,Object>> map = new HashMap<>();
+            List<String> grades = getGrades(teacherDto, school);
+            LinkedHashMap<String,LinkedHashMap<String,Object>> map = new LinkedHashMap<>();
             for (String grade : grades) {
-                Map<String,Object> mapTeach = new HashMap<>();
+                LinkedHashMap<String,Object> mapTeach = new LinkedHashMap<>();
                 mapTeach.put("interaction", new Random().nextInt(50) + 1);
                 mapTeach.put("cooperation", new Random().nextInt(50) + 1);
                 mapTeach.put("test", new Random().nextInt(50) + 1);
@@ -805,6 +796,22 @@ public class TeacherServiceImpl implements TeacherService {
         return list;
     }
 
+    private static @NotNull List<String> getGrades(TeacherDto teacherDto, List<School> school) {
+        List<String> grades = new ArrayList<>();
+        if(school != null && !school.isEmpty()) {
+            for (School base : school) {
+               for (School.Period period : base.getPeriod()) {
+                   if(period.getId().equals(teacherDto.getPeriodId())) {
+                       for(String grade : period.getGrades()) {
+                           grades.add(grade.trim());
+                       }
+                   }
+               }
+            }
+        }
+        return grades;
+    }
+
     public Map<String, Object> getTeacherBase(GpTeacherDto gpTeacherDto, HttpServletRequest request) {
 
         Map<String, Object> gradeMap;