移动组
This commit is contained in:
+3
-9
@@ -49,20 +49,14 @@ public class StudentClassHistoryService implements IStudentClassHistoryService {
|
||||
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(schType);
|
||||
vo.setGradeName(vo.getEnrollYear()+"级");
|
||||
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()+"级");
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user