移动组

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;
 }

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

@@ -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;
     }