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:59:44 +08:00
parent 98b8ec5bc9
commit f69a5c2182
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yunhai/bschclassmanage/model/vo/HistorySchClassVO.java
+5 -1
View File
@@ -3,6 +3,7 @@ package com.yunhai.bschclassmanage.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import javax.persistence.Column;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.util.Date; import java.util.Date;
@@ -34,11 +35,14 @@ public class HistorySchClassVO {
private Boolean graduate; private Boolean graduate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date CreateDate; private Date createDate;
private Integer majorsId; private Integer majorsId;
private String majorsName; private String majorsName;
@Column(name = "enroll_year")
private Integer enrollYear;
private Integer schType; private Integer schType;
} }
src/main/java/com/yunhai/bschclassmanage/service/impl/StudentClassHistoryService.java
+3 -9
View File
@@ -49,20 +49,14 @@ public class StudentClassHistoryService implements IStudentClassHistoryService {
Optional<SchClass> classInfo= schClassService.getSchClassCacheFilter(schId,gradeId,classId).stream().findFirst(); Optional<SchClass> classInfo= schClassService.getSchClassCacheFilter(schId,gradeId,classId).stream().findFirst();
if(!classInfo.isPresent()) throw new DException("班级未找到！"); if(!classInfo.isPresent()) throw new DException("班级未找到！");
HistorySchClassVO vo = ModelMapperUtil.map(classInfo.get(), HistorySchClassVO.class); HistorySchClassVO vo = ModelMapperUtil.map(classInfo.get(), HistorySchClassVO.class);
vo.setSchType(schType);
vo.setGradeName(vo.getEnrollYear()+"级");
if(Objects.equals(schType,SchType.VOCATIONALEDUCATION.getKey())) if(Objects.equals(schType,SchType.VOCATIONALEDUCATION.getKey()))
{ {
vo.setSchType(schBinSchsystemService.getSchType(schId));
Map<Integer, String> majorssNameMap = schDicMajorsService.toIdAndNameMap(schId); Map<Integer, String> majorssNameMap = schDicMajorsService.toIdAndNameMap(schId);
vo.setMajorsName(majorssNameMap.get(vo.getMajorsId())); 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;
} }