userclass/UserclassService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移动组

Browse Source
This commit is contained in:
wanghu
2026-08-21 15:38:45 +08:00
parent 340c22e6a4
commit 98b8ec5bc9
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yunhai/bschclassmanage/service/impl/StudentClassHistoryService.java
+13 -7
View File
@@ -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;
}