移动组

src/main/java/com/yunhai/bschclassmanage/controller/api/SchHistoryController.java

@@ -21,8 +21,8 @@ public class SchHistoryController {
     private IStudentClassHistoryService studentClassHistoryService;  // 使用接口
 
     @GetMapping("getClass")
-    public HistorySchClassVO GetClassFirst(Integer gradeId, Integer classId) {
-        return studentClassHistoryService.GetClassFirst(UserContext.getSchId(),gradeId,classId);
+    public HistorySchClassVO GetClassFirst(Integer classId) {
+        return studentClassHistoryService.GetClassFirst(UserContext.getSchId(),classId);
     }
 
 

src/main/java/com/yunhai/bschclassmanage/service/IStudentClassHistoryService.java

@@ -9,5 +9,5 @@ import java.util.List;
 @Service
 public interface IStudentClassHistoryService {
 
-    HistorySchClassVO GetClassFirst(Integer schId, Integer gradeId, Integer classId);
+    HistorySchClassVO GetClassFirst(Integer schId, Integer classId);
 }

src/main/java/com/yunhai/bschclassmanage/service/impl/StudentClassHistoryService.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 
 @Service
@@ -41,22 +42,27 @@ public class StudentClassHistoryService implements IStudentClassHistoryService {
     private RedisUtil redisUtil;
 
 
-    public HistorySchClassVO GetClassFirst(Integer schId, Integer gradeId, Integer classId) {
 
-      Optional<SchClass> classInfo= schClassService.getSchClassCacheFilter(schId,gradeId,classId).stream().findFirst();
+    public HistorySchClassVO GetClassFirst(Integer schId,Integer classId) {
+        Integer schType=schBinSchsystemService.getSchType(schId);
+        Integer gradeId=null;
+        Optional<SchClass> classInfo= schClassService.getSchClassCacheFilter(schId,gradeId,classId).stream().findFirst();
         if(!classInfo.isPresent()) throw new DException("班级未找到！");
         HistorySchClassVO vo = ModelMapperUtil.map(classInfo.get(), HistorySchClassVO.class);
-        vo.setSchType(schBinSchsystemService.getSchType(schId));
-        if(vo.getSchType().equals(SchType.VOCATIONALEDUCATION.getKey())){
+        if(Objects.equals(schType,SchType.VOCATIONALEDUCATION.getKey()))
+        {
+            vo.setSchType(schBinSchsystemService.getSchType(schId));
             Map<Integer, String> majorssNameMap = schDicMajorsService.toIdAndNameMap(schId);
             vo.setMajorsName(majorssNameMap.get(vo.getMajorsId()));
             vo.setGradeName(vo.getGradeId()+"级");
-        }else {
-            Integer schsystemId= baseSchsystemGradeService.getSchsystemIdByGradeId(schId,gradeId);
+            return vo;
+        }else{
+            Integer schsystemId= baseSchsystemGradeService.getSchsystemIdByGradeId(schId,classInfo.get().getGradeId());
             Map<Integer, String> gradeNameMap = baseSchsystemGradeService.getGradeNameMap(schId, schsystemId, vo.getGradeId());
             vo.setGradeName(gradeNameMap.get(vo.getGradeId()));
+            return vo;
         }
-        return vo;
+
     }