From f69a5c2182fb03673fcd4860b1bf78aae7ce4c6b Mon Sep 17 00:00:00 2001 From: wanghu Date: Fri, 21 Aug 2026 15:59:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bschclassmanage/model/vo/HistorySchClassVO.java | 6 +++++- .../service/impl/StudentClassHistoryService.java | 12 +++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/yunhai/bschclassmanage/model/vo/HistorySchClassVO.java b/src/main/java/com/yunhai/bschclassmanage/model/vo/HistorySchClassVO.java index 001841f..9cc0e91 100644 --- a/src/main/java/com/yunhai/bschclassmanage/model/vo/HistorySchClassVO.java +++ b/src/main/java/com/yunhai/bschclassmanage/model/vo/HistorySchClassVO.java @@ -3,6 +3,7 @@ package com.yunhai.bschclassmanage.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import javax.persistence.Column; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.util.Date; @@ -34,11 +35,14 @@ public class HistorySchClassVO { private Boolean graduate; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date CreateDate; + private Date createDate; private Integer majorsId; private String majorsName; + @Column(name = "enroll_year") + private Integer enrollYear; + private Integer schType; } diff --git a/src/main/java/com/yunhai/bschclassmanage/service/impl/StudentClassHistoryService.java b/src/main/java/com/yunhai/bschclassmanage/service/impl/StudentClassHistoryService.java index e19cb6d..a586e9c 100644 --- a/src/main/java/com/yunhai/bschclassmanage/service/impl/StudentClassHistoryService.java +++ b/src/main/java/com/yunhai/bschclassmanage/service/impl/StudentClassHistoryService.java @@ -49,20 +49,14 @@ public class StudentClassHistoryService implements IStudentClassHistoryService { Optional 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 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 gradeNameMap = baseSchsystemGradeService.getGradeNameMap(schId, schsystemId, vo.getGradeId()); - vo.setGradeName(gradeNameMap.get(vo.getGradeId())); - return vo; } - + return vo; }