学段修改

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

@@ -9,5 +9,5 @@ import java.util.List;
 public interface IBaseSchsystemService {
 
      List<BaseSchsystem> getSchsystemList();
-
+     String getAcademicStageName(Integer schsystemId);
 }

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

@@ -3,10 +3,12 @@ package com.yunhai.bschclassmanage.service.impl;
 import com.yunhai.bschclassmanage.Repository.BaseSchsystemGradeRepository;
 import com.yunhai.bschclassmanage.Repository.BaseSchsystemRepository;
 import com.yunhai.bschclassmanage.entity.BaseSchsystem;
+import com.yunhai.bschclassmanage.enums.AcademicStage;
 import com.yunhai.bschclassmanage.model.vo.TreeSelectVO;
 import com.yunhai.bschclassmanage.service.IBaseSchsystemService;
 import com.yunhai.bschclassmanage.utils.RedisConstants;
 import com.yunhai.bschclassmanage.utils.RedisUtil;
+import com.yunhai.platform.utils.exception.DException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,4 +54,14 @@ public class BaseSchsystemService implements IBaseSchsystemService {
     }
 
 
+    public String getAcademicStageName(Integer schsystemId)
+    {
+        return getSchsystemList().stream()
+                .filter(s -> schsystemId.equals(s.getId()))
+                .findFirst()
+                .map(BaseSchsystem::getAcademicStage)
+                .map(AcademicStage::nameById)
+                .orElseThrow(()->new DException("学制未找到！"));
+    }
+
 }

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

@@ -252,7 +252,7 @@ public class SchBinSchsystemService implements ISchBinSchsystemService {
         //获取学段
         List<Integer> schsystemIds= getSchBinSchsystemIds(schId);
 
-        List<BaseSchsystem> baseSchsystems=baseSchsystemService.getSchsystemList().stream().filter(s->schsystemIds.contains(s.getId())).collect(Collectors.toList());
+        //List<BaseSchsystem> baseSchsystems=baseSchsystemService.getSchsystemList().stream().filter(s->schsystemIds.contains(s.getId())).collect(Collectors.toList());
 
         List<SchBinSchsystem> schBinSchsystemList= getSchBinSchsystemList(schId);
         if(newList.size()==1)
@@ -262,17 +262,11 @@ public class SchBinSchsystemService implements ISchBinSchsystemService {
         {
             Integer scort=1;
             for (SchBinSchsystem schsystem:schBinSchsystemList) {
-                //添加学段组
+                String academicStageName= baseSchsystemService.getAcademicStageName(schsystem.getSchSystemId());
-                Optional<BaseSchsystem> baseSchsystemFirst=  baseSchsystems.stream().filter(s->Objects.equals( schsystem.getSchSystemId(),s.getId())).findFirst();
-                if(baseSchsystemFirst.isPresent())
-                {
-                    String academicStageName= AcademicStage.nameById(baseSchsystemFirst.get().getAcademicStage());
                 BoaGroup sectionGroup= sendUserBaseService.addGroup(academicStageName,stuGroup.getId(),scort,NodeType.SECTION,schId);
                 schsystem.setGroupId(sectionGroup.getId());
                 scort++;
             }
-
-            }
         }else {
             throw new DException("请选择学制！");
         }

src/main/java/com/yunhai/bschclassmanage/service/impl/classes/SchClassInfoService.java

@@ -50,6 +50,9 @@ public class SchClassInfoService {
     @Autowired
     private ISendUserBaseService sendUserBaseService;
 
+    @Autowired
+    private IBaseSchsystemService baseSchsystemService;
+
     @Autowired
     private SchClassLogService logService;
 
@@ -65,14 +68,10 @@ public class SchClassInfoService {
             throw new DException("学生组不存在！");
         }
         Integer parentId=stuGroup.getId();
-
         Integer schsystemId = baseSchsystemGradeService.getSchGradeIdBySchsystemId(schId, gradeId);
-
+        if(schBinSchsystemService.getSchBinSchsystemIds(schId).size()>1)
-        Map<Integer, String> schsystemMap = schBinSchsystemService.getSchBinSchsystemMap(schId);
-
-        if(schsystemMap.size()>1)
         {
-            String academicStageName= schsystemMap.get(schsystemId);
+            String academicStageName= baseSchsystemService.getAcademicStageName(schsystemId);
             List<BoaGroup> schAcademicStageList= comSchTreeService.getAcademicStageGroupList(schId);
             Optional<BoaGroup> academicStageFirst= schAcademicStageList.stream().filter(s->Objects.equals(s.getName(),academicStageName)).findFirst();